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