Hmm
Merge branch 'devel' of github.com:DavePearce/Whiley into devel

Conflicts:
	modules/wyrl/src/wyrl/io/JavaFileWriter.java