Merge branch 'ChipScan-master'
authorClifford Wolf <clifford@clifford.at>
Fri, 1 Sep 2017 10:33:47 +0000 (12:33 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 1 Sep 2017 10:33:47 +0000 (12:33 +0200)

Trivial merge