Merge branch 'ao/config-from-gitmodules'