Pulling ED's main fork into mine.

If you're reading this, ED, don't merge it because I accidentally pulled backwards.