Clean up Coverity warnings from last checkin.
Merge remote-tracking branch 'upstream/master'