Merged refs/pull/3445/head from repository cms-sw
Small Fixes