Baystation12/Baystation12 — pull request #2968 by comma (2013-06-04 09:45:57+00:00)
Title: Updating BEF with master

merge #2967 first