Merge branch 'v1.0.4' into 'master'

Merge for release of v1.0.4

See merge request !595
8 jobs for v1.0.4 in 9 minutes and 18 seconds (queued for 39 seconds)
latest