Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle