Mark remote-tracking branch 'upstream/master' as merged
authormirabilos <t.glaser@tarent.de>
Sat, 20 Oct 2018 22:01:41 +0000 (00:01 +0200)
committermirabilos <mirabilos@evolvis.org>
Sat, 20 Oct 2018 22:01:41 +0000 (00:01 +0200)

Trivial merge