Um, apparently I didn't actually finish merging before committing.