Merge branch 'wip-mdl-37015' of git://github.com/rajeshtaneja/moodle