Baystation12/Baystation12 — pull request #6094 by Raptor1628 (2014-08-21 15:34:13+00:00)
Title: Brig Fixes Clean

Made compliant with the latest master>dev merge