Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle