Merge branch 'master' into 'release'

prepare for v1.0.4

See merge request !21
4 jobs for 1.0.4 in 5 minutes and 18 seconds (queued for 12 seconds)
latest