Merge branch 'translate'
Merge branch 'setupfix'