Merged refs/pull/1010/head from repository cms-sw