Merge remote-tracking branch 'skwash/develop' into develop

Conflicts:
	pip/download.py

Author: dstufft

pip/download.py

@@ -444,7 +444,7 @@ def _check_hash(download_hash, link):
         raise HashMismatch('Hash name mismatch for package %s' % link)
     if download_hash.hexdigest() != link.hash:
         logger.fatal("Hash of the package %s (%s) doesn't match the expected hash %s!"
-                     % (link, download_hash, link.hash))
+                     % (link, download_hash.hexdigest(), link.hash))
         raise HashMismatch('Bad %s hash for package %s' % (link.hash_name, link))