Finish with I18N support
Merge remote-tracking branch 'origin/master'