Merge branch 'master' of D:\Dropbox\Public\iris-java with conflicts.
Formatter changed to Eclipse;