Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle