Import upstream changes?

Honestly don't know what I'm doing.  Let's see what this does.