HomeHEPForge

Merge ATLAS_2013_I1217863 changes from Jon (and add ChangeLog entry)