Merged back in a working Maven build process, with all its various nastiness