Baystation12/Baystation12 — pull request #7470 by PsiOmegaDelta (2014-12-15 07:57:18+00:00)
Title: Dev freeze

Merge remote-tracking branch 'upstream/master' into dev-freeze.