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