Try to fix translator for like the 50th time.
Merge branch '4.0'