Merge branch 'dev' of https://github.com/javapathfinder/jpf-core into dev
authorWillem Visser <willemvisser@rek443068.sun.ac.za>
Wed, 18 Apr 2018 06:07:19 +0000 (08:07 +0200)
committerWillem Visser <willemvisser@rek443068.sun.ac.za>
Wed, 18 Apr 2018 06:07:19 +0000 (08:07 +0200)

Trivial merge