Feature freeze.
Merge pull request #1168 from Lukasa/freeze

Feature freeze.