Merge "Prevent warning twice about Python 3 usage"