Return of the Java 6... Because things
Merge pull request #907 from dlsniper/java6

Return of the Java 6... Because things