Merge remote-tracking branch 'origin/master'
authorUdo Schnurpfeil <lofwyr@apache.org>
Fri, 2 Nov 2018 16:34:42 +0000 (17:34 +0100)
committerUdo Schnurpfeil <lofwyr@apache.org>
Fri, 2 Nov 2018 16:34:42 +0000 (17:34 +0100)

Trivial merge