Baystation12/Baystation12 — pull request #3525 by Segrain (2013-08-15 17:06:14+00:00)
Title: Postmerge mapfixes.

- Fixed some lost-in-merge piping, wiring etc.