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