First commit from CMSSW_7_0_X