Merge branch 'w42_MDL-29887_m22_swfobject' of git://github.com/skodak/moodle