Remove old submodules
Merge branch 'master' into dev-0.4