Resync

As we discussed, this is just to get my fork back in sync.