Correct version is 0.6.3
Merge branch 'master' into gh-pages

Conflicts:
	docs/html/searchindex.js