back port #6305 to CMSSW_7_1_X
Merge branch 'CMSSW_7_1_X' of github.com:wouf/cmssw into CMSSW_7_1_X