updated for CMSSW_7_1_0_pre6