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