Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle