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