Pull from transifex
Version 3.1.1
Revert "Version 3.1.1"

This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167.
Version 3.1.1