Baystation12/Baystation12 — pull request #4002 by DJSnapshot (2013-11-30 17:46:50+00:00)
Title: Merge master into Dev

If someone could fix the changelog conflicts, that'd be great~