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