Thwarted again!
Merge pull request #2935 from misterbook/bleeding-edge-freeze

Thwarted again!