Update README.rst
Merge remote-tracking branch 'origin/master' into version_0.6.4

Conflicts:
	README.rst
Merge remote-tracking branch 'origin/version_0.6.4' into version_0.6.4