Merge branch 'mdl-28517' of git://github.com/colchambers/moodle