Merge remote-tracking branch 'transl/16.11.14-translate-20171121' into 16.11.x
authorKatrin Fischer <katrin.fischer.83@web.de>
Tue, 21 Nov 2017 01:27:42 +0000 (01:27 +0000)
committerKatrin Fischer <katrin.fischer.83@web.de>
Tue, 21 Nov 2017 01:27:42 +0000 (01:27 +0000)

Trivial merge