Merge branch 'util-resurrection'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 5 Nov 2018 11:22:07 +0000 (12:22 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 5 Nov 2018 11:22:07 +0000 (12:22 +0100)

Trivial merge