Make valgrind quiet.
Merge remote-tracking branch 'origin/master' into feature/twolevel-method