changes for Guava 15.0-rc1