Fix a crash per https://bugs.openjdk.java.net/browse/JDK-8250861
This effectively upgrades us to 13.0.5.1