merge with updates from CMSSW_6_2_X branch