Merge pull request #2895 from Erthilo/bleeding-edge-freeze

Bringing Bleeding edge freeze up to date with master