Merge "Use six.moves.urllib.parse instead of urlparse"