Baystation12/Baystation12 — pull request #6598 by GinjaNinja32 (2014-10-04 17:00:42+00:00)
Title: Fixes #6587 and #6590

As in title.

Fixes #6587.
Fixes #6590.