This is a really long commit that will hopefully be well more than 256 characters. Even GitHub is whinging about the length of this message. That's a first.