Baystation12/Baystation12 — pull request #5612 by Zuhayr (2014-07-14 03:24:44+00:00)
Title: Fixes.

Pushing to dev-freeze because I want to minimize conflicts with master when we merge.