Merge branch 'jc/maint-config-exit-status' into maint-1.7.11