Merge branch '0.4.x'
Merge remote-tracking branch 'mich/master' into 0.4.x