Identical patch as for devel-project branch.
Identical patch as for devel-project branch.

hjwylde/whiley-compiler,hjwylde/whiley-compiler,hjwylde/whiley-compiler,Whiley/WhileyCompiler,hjwylde/whiley-compiler,hjwylde/whiley-compiler