Merge branch 'w33_MDL-29027_m22_textlib' of git://github.com/skodak/moodle