just trying to make a little better
Merge remote-tracking branch 'upstream/master' (I screwed up the earlier merge)