Removed references to Java 7.
Merge remote-tracking branch 'upstream/master'