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