Modernize, prodded by Alex Stangl
Merge branch 'master' of https://github.com/IanDarwin/javasrc