fixing a problem with DQM
Merge branch 'master' of https://github.com/cmsdaq/merger