Merge branch 'dubiously-nested-submodules'