Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle