Merge branch 'w08_MDL-42889_m27_vir' of https://github.com/skodak/moodle