Update to support java 6
Merge branch 'hotfix-openjdk-6-support'