Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle