This change was intended to end up in 7u40 but for some reason we missed it. The original bug which went into 8 is:
https://bugs.openjdk.java.net/browse/JDK-8019184 and the pushed changeset: http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/bd6949f9dbb2 This is the new 7u60 backport with approval: https://bugs.openjdk.java.net/browse/JDK-8034024
