Merge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle