Valgrind is not optional
Merge commit '603f8a62eefe45f01c7a9df1fa4f8256b86a593a'