Fix issue introduced in #2619
Merge pull request #2695 from ktf/fix-2619

Fix issue introduced in #2619
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X