Transifex pull pre-0.9.0rc3/final
Merge pull request #3835

064a690 Transifex pull pre-0.9.0rc3/final (Wladimir J. van der Laan)