Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle