Merge pull request #2283 from octo/ff/valgrind