Baystation12/Baystation12 — pull request #2930 by comma (2013-06-01 00:45:25+00:00)
Title: Bleeding edge freeze

Merged master in.

Fixed #2913