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