Merge branch 'master' into 'release'

prepare for v1.0.7 continued

See merge request !26
6 jobs for release in 15 minutes and 46 seconds (queued for 13 seconds)