Merge branch 'CMSSW_6_2_X' into CMSSW_7_0_X