Merge branch 'jc/rm-submodule-error-message'