Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle