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