re-updated manually from official-cmssw/CMSSW_7_0_X