Merge branch 'master' into Adam-Jones
had a conflict that I didn't fix I guess
Merge branch 'Adam-Jones'