Updated to latest build
Preparing release 1.5
Back to development: 1.6
Merge branch 'master' into develop

Conflicts:
	docs/HISTORY.rst
	setup.py