Merge branch 'MDL-65762-master' of git://github.com/abgreeve/moodle