Support building under Java 7
Merge branch 'master' into unimelb