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