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