Merge
Don't try to cast sys.executable to unicode on py3