Baystation12/Baystation12 — pull request #7334 by PsiOmegaDelta (2014-12-09 08:09:08+00:00)
Title: Dev freeze

Merges master into dev-freeze.