Merge branch 'cnfvar-fixes'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Thu, 7 Feb 2019 15:15:45 +0000 (16:15 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Thu, 7 Feb 2019 15:50:39 +0000 (16:50 +0100)

Trivial merge