Recommitting Di's changes as Git stuffed it up...