Merge branch 'w36_MDL-34097_m22_environment' of git://github.com/skodak/moodle into...