Merge remote-tracking branch 'translate/17.05.10-translate-20180327' into 17.05.x