Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle