Merge branch 'master' into 'release'

prepare for v1.0.7

See merge request !25
6 jobs for release in 27 minutes (queued for 6 seconds)