Changes for v1.3 - Fix Guava issue on IntelliJ IDEA 14.0