follow changes in LHCb!301

Gerhard Ravenrequested to merge
follow-lhcb-301 into Sim09ToMaster

see LHCb!301 (merged) and Marco's comment on LHCb@2754c33b

Merge request reports