Template translations.
Template Translations.
Merge remote-tracking branch 'upstream/master'