Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X