Merge branch 'mdl-50957' of git://github.com/cdsmith-umn/moodle