Merge in a bunch of changes.

Meaningful comment here.