the dreaded merge
Merge remote-tracking branch 'upstream/master'
phil changed some things