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