This is going to be a really long commit summary.

But it's okay, because I'm going to put the rest of it in the 
extended description.