Merge "Fix compilation with JDK8"