Merge branch 'master' into 'release'

fixes for 1.0.2

See merge request !19
8 jobs for release in 20 minutes and 31 seconds (queued for 19 seconds)