HomeHEPForge

Merge uncommited changes from the golem-1.2.1 tarball.