Align to CMSSW_5_3_11_patch3.