Merge branch '0.4'

6 jobs for master in 19 minutes and 34 seconds (queued for 2 seconds)