Baystation12/Baystation12 — pull request #4190 by Ccomp5950 (2014-01-03 17:06:09+00:00)
Title: Compile fix after bad merge.

VERY BAD MERGE, no treats.