Merge branch 'v0.8.4' into 'master'

V0.8.4

See merge request !139
8 jobs for master in 20 minutes and 15 seconds (queued for 2 seconds)