Merge 2 years of master changes

Merge the past 2 years of changes to the master branch onto my master branch