sync with IB/CMSSW_5_3_X/stable