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