Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle