Merge clean-up branch
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 8 Oct 2018 07:29:39 +0000 (09:29 +0200)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 8 Oct 2018 07:29:39 +0000 (09:29 +0200)

Trivial merge