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