Merge remote-tracking branch 'translate/17.05.06-translate-20171122' into 17.05.x