Merge branch '0.4-dev' into gh-pages