HomeHEPForge

merging release-2-6-x into options branch