Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle