Merge pull request #94 from googlei18n/opensource_update_15416

(AUTOMATIC) opensource update