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