Build for running on Java 6
Merge branch 'java6' of PR #14