am 2ff3c2cd: Merge "Fix valgrind tests"

* commit '2ff3c2cd515963ca8ba493c22a24f9e0df4f1bdd':
  Fix valgrind tests