Baystation12/Baystation12 — pull request #7244 by Zuhayr (2014-12-06 01:06:28+00:00)
Title: Updating dev-freeze with current code.

From this point on until staging is over, please target dev-freeze with dev fixes.