Finish B1.1 Merge

All beta 1.1 assets merged. Still newer changes needing to be merged.