Merge branch 'master' into btor-ng
authorClifford Wolf <clifford@clifford.at>
Fri, 1 Dec 2017 22:51:58 +0000 (23:51 +0100)
committerClifford Wolf <clifford@clifford.at>
Fri, 1 Dec 2017 22:51:58 +0000 (23:51 +0100)

Trivial merge