Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle