Cleanup master branch for merge 1.0-beta3 submodule