Bump version number to 0.4.0
Merge branch '3.3/release-0.4' into 3.3/develop