cleanup 1.0-beta3 for submodule usage
Merge branch '1.0-beta3'