Merge branch 'w36_MDL-29292_m22_featuretypo' of git://github.com/skodak/moodle