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