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