Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle