Update JDK6 branch