#vf-2 Fixed I18n translation fast fix.
Merge remote-tracking branch 'origin/master'