Baystation12/Baystation12 — pull request #4746 by mwerezak (2014-04-12 22:57:11+00:00)
Title: Fixes #4635

Fix for https://github.com/Baystation12/Baystation12/issues/4635 + some cleanup.