Merge branch 'w15_MDL-25826_m20_htmlpurifier' of git://github.com/skodak/moodle into...