Add Java 6 Support
Merge branch 'zh-patch' into locate-zh