Merge remote-tracking branch 'template/master' into update-from-template-3

Conflicts:
	README.rst
	setup.py