Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle