Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle