Use release version of Guava
Merge branch 'release/0.9.0'
Tidy-up