Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle