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