Merge branch 'MDL-37598-abort-after-config' of git://github.com/mudrd8mz/moodle