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