Merge branch 'master' into development

pystache/__init__.py

@@ -10,4 +10,4 @@ from pystache.init import parse, render, Renderer, TemplateSpec
 
 __all__ = ['parse', 'render', 'Renderer', 'TemplateSpec']
 
-__version__ = '0.5.2-rc.1'  # Also change in setup.py.
+__version__ = '0.5.2'  # Also change in setup.py.

setup.py

@@ -97,7 +97,7 @@ else:
     setup = dist.setup
 
 
-VERSION = '0.5.2-rc.1'  # Also change in pystache/__init__.py.
+VERSION = '0.5.2'  # Also change in pystache/__init__.py.
 
 FILE_ENCODING = 'utf-8'