Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle