Updates including a fix for busted diff parsing.