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