And after I said this is a good idea, I just accidentally merged my changes to VR3 to upstream/devel instead of origin/devel. Grrr. No harm done, I think, because these changes were the ones that start to add asciidoc rendering, and they work on my computer at least. They don't change any other functionality that someone would be using.
But I had better make sure I know how to avoid this in the future. I've been working with Git Extensions, and somewhere I didn't notice that it had changed my checkout branch from origin to upstream.