Merge branch 'w36_MDL-29081_m22_googlespellproxy' of git://github.com/skodak/moodle