Baystation12/Baystation12 — pull request #2242 by caelaislinn (2013-02-01 13:31:59+00:00)
Title: Merge from Master, some tweaks and fixes

See commit log. Please consider merging #2241 first, so I can include it in here.