Baystation12/Baystation12 — pull request #7305 by PsiOmegaDelta (2014-12-08 16:40:11+00:00)
Title: Dev freeze

Merges dev-freeze into master.