pldi14 merged heathers changes