Merge branch 'ss/gitmodules-ignore-doc'