Python3 support back into trunk