Override portrait user information
Hostory
Preparing release 1.6
Back to development: 1.7
Merge branch 'master' into develop

Conflicts:
	docs/HISTORY.rst
	setup.py