Merged refs/pull/1039/head from repository cms-sw
correct files added