Merge branch 'master' into btor-ng
authorClifford Wolf <clifford@clifford.at>
Fri, 24 Nov 2017 17:14:53 +0000 (18:14 +0100)
committerClifford Wolf <clifford@clifford.at>
Fri, 24 Nov 2017 17:14:53 +0000 (18:14 +0100)

Trivial merge