Baystation12/Baystation12 — pull request #3800 by Segrain (2013-10-21 01:17:49+00:00)
Title: Dev update.

Stuff from master, some small new things.