Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle