Merge branch 'wip-mdl-33166-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_...