Fix up submodules to match master