minor performance improvement
Merge remote-tracking branch 'origin/master' into translation