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