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