Merge branch 'master' into btor-ng
authorClifford Wolf <clifford@clifford.at>
Thu, 14 Dec 2017 02:13:47 +0000 (03:13 +0100)
committerClifford Wolf <clifford@clifford.at>
Thu, 14 Dec 2017 02:13:47 +0000 (03:13 +0100)

Trivial merge