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