Minor hotfix release to re-order generated code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHANGELOG.rst
	README.rst