Commit 0652abaaeaff768e78a65464e59bd1896ce2f6ce

Patrick Steinhardt 2018-07-20T12:56:49

Merge pull request #4702 from tiennou/fix/coverity Assorted Coverity fixes