Merged refs/pull/2467/head from repository cms-sw
fix