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

Trivial merge