Merge branch 'master' into btor-ng
authorClifford Wolf <clifford@clifford.at>
Mon, 27 Nov 2017 18:45:15 +0000 (19:45 +0100)
committerClifford Wolf <clifford@clifford.at>
Mon, 27 Nov 2017 18:45:15 +0000 (19:45 +0100)

Trivial merge