Baystation12/Baystation12 — pull request #1751 by CIB (2012-10-12 20:59:11+00:00)
Title: Tons of fixes from the piratepad

http://piratepad.net/9CwFobI4lZ