more elegant patch for translation ordering
Merge branch 'master' into loading-indicator