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