What's up with the github diff?  This is already in master, right?