Baystation12/Baystation12 — pull request #2187 by CIB (2013-01-15 21:28:10+00:00)
Title: Merge pre-tg-merge BEF

Nice chunk of updates. :D