Merge with latest Baystation13 changes.