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