merge CMSSW_6_2_0_SLHC10