Upgrade.
0.4.0
Merge branch '0.4.x'