Clean-up suggested by flake8 and pylint.
Bump versions
Merge branch 'release-19' into develop
Merge branch 'develop' into feature-ospalh-special

Conflicts:
	scalar.py