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