Merged and fixed.  GitHub has been flaky this morning and commits are out of sync.  Apparently they just kicked the server and it's back online.