Merge branch 'w42_MDL-29878_m22_typo3' of git://github.com/skodak/moodle