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