backport to CMSSW_7_2_X
Merge branch 'CMSSW_7_2_X' of https://github.com/wouf/cmssw into CMSSW_7_2_X