Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle