Merge branch 'ao/submodule-wo-gitmodules-checked-out'