Merge remote-tracking branch 'upstream/master'

scripts/setup-ubuntu.sh

@@ -220,7 +220,6 @@ PACKAGES+=" libdbus-glib-1-dev-bin"
 PACKAGES+=" libgdk-pixbuf2.0-dev"
 PACKAGES+=" libgl-dev"
 PACKAGES+=" libwayland-dev"
-PACKAGES+=" python-setuptools"
 PACKAGES+=" python3-html5lib"
 PACKAGES+=" python3-xcbgen"
 PACKAGES+=" sassc"
@@ -325,12 +324,6 @@ $SUDO apt-get -yq update
 $SUDO env DEBIAN_FRONTEND=noninteractive \
 	apt-get install -yq --no-install-recommends $PACKAGES
 
-# Pip for python2.
-curl -L --output /tmp/py2-get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py
-$SUDO python2 /tmp/py2-get-pip.py
-rm -f /tmp/py2-get-pip.py
-$SUDO rm -f /usr/local/bin/pip
-
 $SUDO locale-gen --purge en_US.UTF-8
 echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale