Merge branch 'wip-MDL-25651' of git://github.com/jennymgray/moodle