2140: change transifex script to use --ff-only
Merge pull request #130 from pculture/i-2140

2140: change transifex script to use --ff-only
Merge branch 'staging' into dev