Baystation12 merge for 2014-01-10