Merge branch 'master' into btor-ng
authorClifford Wolf <clifford@clifford.at>
Sun, 10 Dec 2017 00:27:41 +0000 (01:27 +0100)
committerClifford Wolf <clifford@clifford.at>
Sun, 10 Dec 2017 00:27:41 +0000 (01:27 +0100)

Trivial merge