Merge branch 'master' into dev

Conflicts:
	tests/test_COREG.py
6 jobs for master in 9 minutes and 51 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
passed test_arosics #7527

00:02:37

83.0%
passed test_arosics_install #7529

00:06:24

passed test_styles #7528

00:00:19

 
  Cleanup
passed cleanup_pypirc #7531

00:00:14

 
  Deploy
passed pages #7530

00:00:15

passed pages:deploy

00:00:00