Baystation12/Baystation12 — pull request #4762 by mwerezak (2014-04-16 20:52:07+00:00)
Title: Fixes #4649

Redo of the previous bad PR. Good thing for git cherry-pick.