Baystation12/Baystation12 — pull request #2332 by CIB (2013-02-13 19:09:17+00:00)
Title: Do not merge yet

This is mostly just a pull to keep reference of the differences between master and BEF. I made a new branch BEF-staging so we can test it without new commits being added and messing things up.