Merge branch 'mdl-53133-master' of git://github.com/deraadt/moodle