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