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