Merge branch 'w46_MDL-30308_m22_reqstrict' of git://github.com/skodak/moodle