update submodule
Merge branch 'branch-6-4' into coverity
more coverity fixes