Pick up SMatrix changes.
Merge pull request #671 from ktf/smatrix-enable

Smatrix enable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable