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