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

Trivial merge