Merge commit 'cc76ea6' into my-71x
Merge branch 'CMSSW_7_1_X' into my-71x
Merge branch 'my-71x' of github.com:venturia/cmssw into my-71x