Merge branch 'master' into 0.5

Conflicts:
	mkdocs.yml
	theme/readthedocs/base.html
	theme/readthedocs/versions.html

Author: alexey

theme/readthedocs/versions.html

@@ -14,7 +14,7 @@
         <dl>
             <dt>Versions</dt>
             {% for release in config.versions.releases %}
-            {% if release == "master" %}
+            {% if release == "0.6" %}
             <dd><a href="/">{{ release }}</a></dd>
             {% else %}
             <dd><a href="/{{ release }}">{{ release }}</a></dd>