Merge branch 'master' into 'release'

prepare for v1.0.7 continued part 2

See merge request !27
4 jobs for 1.0.7
latest