As the resident git noob, I managed to undo part of one of kparal's commits in the pytest branch.
Note: This does not affect master or any other branches
I think that I know what happend but I'm still working out the how, why and how to fix. Fortunately, I just un-renamed some variables so if all else fails I can just re-rename those variables by hand.
Just figured that I would say something in case somebody noticed. I'm in the process of learning how to fix it and trying to resist the urge to q-n-d rename by hand. I'm prioritizing this under the assumption that nobody else would be affected if it takes me a little while so please correct me if I'm wrong.
Tim