pre-merge with connor's stuff
Merge remote-tracking branch 'origin/master'