Merge branch 'hotfix/gridspec'
Merge branch 'release/0.42'
Merge branch 'release/0.43'
Merge branch 'release/0.44'
Merge branch 'release/0.45'
Merge branch 'release/0.46.0'
Merge branch 'release/0.50.0'
Merge branch 'release/0.50.1'
Merge branch 'release/0.50.2'
Merge branch 'release/0.60.0'
bugfix: timeslice was taking off last digit
Merge branch 'hotfix/0.60.1' into develop

Conflicts:
	CHANGES.md
	doc/ver.py