Merge remote-tracking branch 'translate/17.05.02-translate-20170727' into 17.05.x