Merge branch 'release-1.0.2' (early part)
Merge branch 'master' of github.com:agmip/translator-dist.git into develop