Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle