Merge branch 'less-unittest-clutter'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 Jan 2019 09:59:45 +0000 (10:59 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 Jan 2019 09:59:45 +0000 (10:59 +0100)

Trivial merge