Bleeding edge freeze

Master/BEF are out of sync. Pulled BEF and then master, then pushed here. If this was a terrible idea, do ping me on #codershuttle.