Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle