Merge branch 'wip'
Removing submodule
Merge branch 'master' into wip