Merge master into dev

Master got ahead on commits. Going to try and merge master into working dev branch.