Merge branch '1.6-translate' into 1.6