Merge branch 'wip-MDL-60478-m35' of git://github.com/amygroshek/moodle