branch to port to JDK 1.6