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