Merge master --> release

- [ ] @Bryan-Burkett 
- [ ] @VanCleave00 

This should never happen again, but I just did a bunch of stuff on master, and now I want to get it into release. From now on We should work off separate branches from release, and Pull Request them into release. Periodically we will merge release into master for official updates.