Merge Krinkle's changes to ve-dirtydiffbot