Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle