`Optional.fromNullable` not `Optional.of` ...grumble......
 - seriously... why two methods which can do the same thing??
Merge branch 'GT-49'