Merge remote-tracking branch 'gravitystorm/i18n' into staging