Catch-up merge from master sources @186586 to branch/2014-04-09/coverity.