Merge branch 'MDL-37422' of git://github.com/colchambers/moodle