Merge branch 'v0.10.4' into 'master'

Merge for release

See merge request !357
7 jobs for v0.10.4 in 4 minutes and 55 seconds (queued for 1 minute and 31 seconds)
latest