3.7 transifex

Merger: please pay attention the the 92b54fd commit message. Thanks!