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