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