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