Also include fix for Python 3.7 PEP-479 enforcement from ita1024/waf@facdc0b1 Fixes Gitlab issue #493