Merge commit 'CMSSW_5_3_11' into from-CMSSW_5_3_11_patch3