Merge remote-tracking branch 'upstream/master'

# Major merge.  Importing Jeff styles in a bajillion places.