Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle