Merge branch 'config-non-executable' into config-non-executable-merge

The merge is now trivial.