Merge branch '0.4'

6 jobs for master in 20 minutes and 43 seconds (queued for 1 second)