I just merged James' MR that adds adds the new waf and keeps the old waf. If you have any python2 environments, please test, and give an extra scan over the printout. I don't have any python2 environments to test with. -- These are my opinions. I hate spam.