Merge branch 'master' into test-john
Merge pull request #57 from CMSCompOps/test-john

Merge branch 'master' into test-john