Merge "Fix double-accounting bug in liblp."