Merge.

Really, this merge is to make sure I haven't messed anything up yet.