Baystation12/Baystation12 — pull request #6947 by mwerezak (2014-11-05 05:06:37+00:00)
Title: Fixes #6299, Again

Fixes #6299