Merge branch 'master' into dev

Conflicts:
	tests/test_COREG.py
6 jobs for master in 9 minutes and 51 seconds (queued for 3 seconds)