Trivial change.
Merge pull request #756 from ktf/trivial-change

Trivial change.
Merge pull request #764 from cms-sw/IB/CMSSW_7_1_X/stable

Forward port IB/CMSSW_7_1_X/stable into IB/CMSSW_7_2_X/stable
A conflicting pull request.
Merge pull request #765 from ktf/trivial-change

A conflicting pull request.
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_2_X/stable' into IB/CMSSW_7_0_X/stable