Merge branch '0.4.x'
Merge branch 'master' into 0.4.x