Transifex sync
Finishing release 2.1.1