Merging a crap ton of changes and fixes into master for 1.1.1.