Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle