Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle