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