Master to bleeding-edge Freeze

I think I am doing this right.