Dev freeze

Merges master into dev-freeze.