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