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