This fix will only affect the master--HepMC2 nightlies, but merging it here to avoid conflicts.
Tagging @averbyts