Darn, forgot to rebase this one.  Will do so now.