Merge branch 'cnfvar-py'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Fri, 1 Dec 2017 15:33:05 +0000 (16:33 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Fri, 1 Dec 2017 15:33:05 +0000 (16:33 +0100)

Trivial merge