Merge branch 'cnfvar-dev'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 5 Nov 2018 11:21:17 +0000 (12:21 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 5 Nov 2018 11:21:17 +0000 (12:21 +0100)

Trivial merge