Re-add submodule.
Merge branch 'master' into dev