Merge branch 'w41_MDL-35691_m24_intsizes' of git://github.com/skodak/moodle