Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle