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