Feature freeze.

See issue #1165.

Not finished yet, gotta do the contributing.md thing.