Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle