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