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