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