Incorporated jdk7u13-b20 changes.