Catch-up merge from master sources to pick up fixes for Coverity issues.
No need to run the Coverity scan multiple times: once will do.