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