Partial V15WMore
Merge branch 'master' of github.com:jordantucker/cmssw-usercode