For #62, now that we're abandoning Java 5 for 5.x.
Merge branch 'EdJoJob-master'