Aligned to CMSSW_6_2_0.