Merge in warnings-valgrind