catch-up with guava 15.0