Merge jcufi / translator-stics master branch