diff --git a/third_party/2/boto/__init__.pyi b/third_party/2/boto/__init__.pyi
deleted file mode 100644
index 329757c594d4..000000000000
--- a/third_party/2/boto/__init__.pyi
+++ /dev/null
@@ -1,78 +0,0 @@
-# Stubs for boto (Python 2)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-from typing import Any
-import logging
-
-Version = ...  # type: Any
-UserAgent = ...  # type: Any
-config = ...  # type: Any
-BUCKET_NAME_RE = ...  # type: Any
-TOO_LONG_DNS_NAME_COMP = ...  # type: Any
-GENERATION_RE = ...  # type: Any
-VERSION_RE = ...  # type: Any
-ENDPOINTS_PATH = ...  # type: Any
-
-def init_logging(): ...
-
-class NullHandler(logging.Handler):
-    def emit(self, record): ...
-
-log = ...  # type: Any
-perflog = ...  # type: Any
-
-def set_file_logger(name, filepath, level=..., format_string=...): ...
-def set_stream_logger(name, level=..., format_string=...): ...
-def connect_sqs(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_s3(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_gs(gs_access_key_id=..., gs_secret_access_key=..., **kwargs): ...
-def connect_ec2(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_elb(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_autoscale(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudwatch(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_sdb(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_fps(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_mturk(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudfront(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_vpc(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_rds(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_rds2(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_emr(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_sns(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_iam(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_route53(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudformation(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_euca(host=..., aws_access_key_id=..., aws_secret_access_key=..., port=..., path=..., is_secure=..., **kwargs): ...
-def connect_glacier(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_ec2_endpoint(url, aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_walrus(host=..., aws_access_key_id=..., aws_secret_access_key=..., port=..., path=..., is_secure=..., **kwargs): ...
-def connect_ses(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_sts(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_ia(ia_access_key_id=..., ia_secret_access_key=..., is_secure=..., **kwargs): ...
-def connect_dynamodb(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_swf(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudsearch(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudsearch2(aws_access_key_id=..., aws_secret_access_key=..., sign_request=..., **kwargs): ...
-def connect_cloudsearchdomain(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_beanstalk(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_elastictranscoder(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_opsworks(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_redshift(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_support(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudtrail(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_directconnect(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_kinesis(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_logs(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_route53domains(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cognito_identity(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cognito_sync(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_kms(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_awslambda(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_codedeploy(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_configservice(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_cloudhsm(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_ec2containerservice(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def connect_machinelearning(aws_access_key_id=..., aws_secret_access_key=..., **kwargs): ...
-def storage_uri(uri_str, default_scheme=..., debug=..., validate=..., bucket_storage_uri_class=..., suppress_consec_slashes=..., is_latest=...): ...
-def storage_uri_for_key(key): ...
diff --git a/third_party/2and3/boto/__init__.pyi b/third_party/2and3/boto/__init__.pyi
new file mode 100644
index 000000000000..a95c1df0f12c
--- /dev/null
+++ b/third_party/2and3/boto/__init__.pyi
@@ -0,0 +1,80 @@
+# Stubs for boto (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional, Text
+import logging
+
+from .s3.connection import S3Connection
+
+Version = ...  # type: Any
+UserAgent = ...  # type: Any
+config = ...  # type: Any
+BUCKET_NAME_RE = ...  # type: Any
+TOO_LONG_DNS_NAME_COMP = ...  # type: Any
+GENERATION_RE = ...  # type: Any
+VERSION_RE = ...  # type: Any
+ENDPOINTS_PATH = ...  # type: Any
+
+def init_logging(): ...
+
+class NullHandler(logging.Handler):
+    def emit(self, record): ...
+
+log = ...  # type: Any
+perflog = ...  # type: Any
+
+def set_file_logger(name, filepath, level: Any = ..., format_string: Optional[Any] = ...): ...
+def set_stream_logger(name, level: Any = ..., format_string: Optional[Any] = ...): ...
+def connect_sqs(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_s3(aws_access_key_id: Optional[Text] = ..., aws_secret_access_key: Optional[Text] = ..., **kwargs) -> S3Connection: ...
+def connect_gs(gs_access_key_id: Optional[Any] = ..., gs_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_ec2(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_elb(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_autoscale(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudwatch(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_sdb(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_fps(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_mturk(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudfront(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_vpc(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_rds(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_rds2(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_emr(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_sns(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_iam(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_route53(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudformation(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_euca(host: Optional[Any] = ..., aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., port: int = ..., path: str = ..., is_secure: bool = ..., **kwargs): ...
+def connect_glacier(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_ec2_endpoint(url, aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_walrus(host: Optional[Any] = ..., aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., port: int = ..., path: str = ..., is_secure: bool = ..., **kwargs): ...
+def connect_ses(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_sts(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_ia(ia_access_key_id: Optional[Any] = ..., ia_secret_access_key: Optional[Any] = ..., is_secure: bool = ..., **kwargs): ...
+def connect_dynamodb(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_swf(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudsearch(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudsearch2(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., sign_request: bool = ..., **kwargs): ...
+def connect_cloudsearchdomain(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_beanstalk(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_elastictranscoder(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_opsworks(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_redshift(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_support(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudtrail(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_directconnect(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_kinesis(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_logs(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_route53domains(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cognito_identity(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cognito_sync(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_kms(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_awslambda(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_codedeploy(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_configservice(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_cloudhsm(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_ec2containerservice(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def connect_machinelearning(aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., **kwargs): ...
+def storage_uri(uri_str, default_scheme: str = ..., debug: int = ..., validate: bool = ..., bucket_storage_uri_class: Any = ..., suppress_consec_slashes: bool = ..., is_latest: bool = ...): ...
+def storage_uri_for_key(key): ...
diff --git a/third_party/2and3/boto/auth.pyi b/third_party/2and3/boto/auth.pyi
new file mode 100644
index 000000000000..8fdf6ae021ca
--- /dev/null
+++ b/third_party/2and3/boto/auth.pyi
@@ -0,0 +1,112 @@
+# Stubs for boto.auth (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+from boto.auth_handler import AuthHandler
+
+SIGV4_DETECT = ...  # type: Any
+
+class HmacKeys:
+    host = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def update_provider(self, provider): ...
+    def algorithm(self): ...
+    def sign_string(self, string_to_sign): ...
+
+class AnonAuthHandler(AuthHandler, HmacKeys):
+    capability = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def add_auth(self, http_request, **kwargs): ...
+
+class HmacAuthV1Handler(AuthHandler, HmacKeys):
+    capability = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def update_provider(self, provider): ...
+    def add_auth(self, http_request, **kwargs): ...
+
+class HmacAuthV2Handler(AuthHandler, HmacKeys):
+    capability = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def update_provider(self, provider): ...
+    def add_auth(self, http_request, **kwargs): ...
+
+class HmacAuthV3Handler(AuthHandler, HmacKeys):
+    capability = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def add_auth(self, http_request, **kwargs): ...
+
+class HmacAuthV3HTTPHandler(AuthHandler, HmacKeys):
+    capability = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def headers_to_sign(self, http_request): ...
+    def canonical_headers(self, headers_to_sign): ...
+    def string_to_sign(self, http_request): ...
+    def add_auth(self, req, **kwargs): ...
+
+class HmacAuthV4Handler(AuthHandler, HmacKeys):
+    capability = ...  # type: Any
+    service_name = ...  # type: Any
+    region_name = ...  # type: Any
+    def __init__(self, host, config, provider, service_name: Optional[Any] = ..., region_name: Optional[Any] = ...) -> None: ...
+    def headers_to_sign(self, http_request): ...
+    def host_header(self, host, http_request): ...
+    def query_string(self, http_request): ...
+    def canonical_query_string(self, http_request): ...
+    def canonical_headers(self, headers_to_sign): ...
+    def signed_headers(self, headers_to_sign): ...
+    def canonical_uri(self, http_request): ...
+    def payload(self, http_request): ...
+    def canonical_request(self, http_request): ...
+    def scope(self, http_request): ...
+    def split_host_parts(self, host): ...
+    def determine_region_name(self, host): ...
+    def determine_service_name(self, host): ...
+    def credential_scope(self, http_request): ...
+    def string_to_sign(self, http_request, canonical_request): ...
+    def signature(self, http_request, string_to_sign): ...
+    def add_auth(self, req, **kwargs): ...
+
+class S3HmacAuthV4Handler(HmacAuthV4Handler, AuthHandler):
+    capability = ...  # type: Any
+    region_name = ...  # type: Any
+    def __init__(self, *args, **kwargs) -> None: ...
+    def clean_region_name(self, region_name): ...
+    def canonical_uri(self, http_request): ...
+    def canonical_query_string(self, http_request): ...
+    def host_header(self, host, http_request): ...
+    def headers_to_sign(self, http_request): ...
+    def determine_region_name(self, host): ...
+    def determine_service_name(self, host): ...
+    def mangle_path_and_params(self, req): ...
+    def payload(self, http_request): ...
+    def add_auth(self, req, **kwargs): ...
+    def presign(self, req, expires, iso_date: Optional[Any] = ...): ...
+
+class STSAnonHandler(AuthHandler):
+    capability = ...  # type: Any
+    def add_auth(self, http_request, **kwargs): ...
+
+class QuerySignatureHelper(HmacKeys):
+    def add_auth(self, http_request, **kwargs): ...
+
+class QuerySignatureV0AuthHandler(QuerySignatureHelper, AuthHandler):
+    SignatureVersion = ...  # type: int
+    capability = ...  # type: Any
+
+class QuerySignatureV1AuthHandler(QuerySignatureHelper, AuthHandler):
+    SignatureVersion = ...  # type: int
+    capability = ...  # type: Any
+    def __init__(self, *args, **kw) -> None: ...
+
+class QuerySignatureV2AuthHandler(QuerySignatureHelper, AuthHandler):
+    SignatureVersion = ...  # type: int
+    capability = ...  # type: Any
+
+class POSTPathQSV2AuthHandler(QuerySignatureV2AuthHandler, AuthHandler):
+    capability = ...  # type: Any
+    def add_auth(self, req, **kwargs): ...
+
+def get_auth_handler(host, config, provider, requested_capability: Optional[Any] = ...): ...
+def detect_potential_sigv4(func): ...
+def detect_potential_s3sigv4(func): ...
diff --git a/third_party/2and3/boto/auth_handler.pyi b/third_party/2and3/boto/auth_handler.pyi
new file mode 100644
index 000000000000..097f762c993e
--- /dev/null
+++ b/third_party/2and3/boto/auth_handler.pyi
@@ -0,0 +1,13 @@
+# Stubs for boto.auth_handler (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+from boto.plugin import Plugin
+
+class NotReadyToAuthenticate(Exception): ...
+
+class AuthHandler(Plugin):
+    capability = ...  # type: Any
+    def __init__(self, host, config, provider) -> None: ...
+    def add_auth(self, http_request): ...
diff --git a/third_party/2and3/boto/compat.pyi b/third_party/2and3/boto/compat.pyi
new file mode 100644
index 000000000000..85539f88be9b
--- /dev/null
+++ b/third_party/2and3/boto/compat.pyi
@@ -0,0 +1,14 @@
+# Stubs for boto.compat (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+from base64 import encodestring as encodebytes
+
+from six.moves import http_client
+
+expanduser = ...  # type: Any
+StandardError = ...  # type: Any
+long_type = ...  # type: Any
+unquote_str = ...  # type: Any
+parse_qs_safe = ...  # type: Any
diff --git a/third_party/2/boto/connection.pyi b/third_party/2and3/boto/connection.pyi
similarity index 51%
rename from third_party/2/boto/connection.pyi
rename to third_party/2and3/boto/connection.pyi
index 189f12e5f232..584716a61a4c 100644
--- a/third_party/2/boto/connection.pyi
+++ b/third_party/2and3/boto/connection.pyi
@@ -1,10 +1,11 @@
-# Stubs for boto.connection (Python 2)
+# Stubs for boto.connection (Python 3.5)
 #
 # NOTE: This dynamically typed stub was automatically generated by stubgen.
 
-from typing import Any
+from typing import Any, Dict, Optional, Text
+from six.moves import http_client
 
-HAVE_HTTPS_CONNECTION = ...  # type: Any
+HAVE_HTTPS_CONNECTION = ...  # type: bool
 ON_APP_ENGINE = ...  # type: Any
 PORTS_BY_SECURITY = ...  # type: Any
 DEFAULT_CA_CERTS_FILE = ...  # type: Any
@@ -18,10 +19,10 @@ class HostConnectionPool:
     def clean(self): ...
 
 class ConnectionPool:
-    CLEAN_INTERVAL = ...  # type: Any
-    STALE_DURATION = ...  # type: Any
+    CLEAN_INTERVAL = ...  # type: float
+    STALE_DURATION = ...  # type: float
     host_to_pool = ...  # type: Any
-    last_clean_time = ...  # type: Any
+    last_clean_time = ...  # type: float
     mutex = ...  # type: Any
     def __init__(self) -> None: ...
     def size(self): ...
@@ -42,9 +43,13 @@ class HTTPRequest:
     def __init__(self, method, protocol, host, port, path, auth_path, params, headers, body) -> None: ...
     def authorize(self, connection, **kwargs): ...
 
+class HTTPResponse(http_client.HTTPResponse):
+    def __init__(self, *args, **kwargs) -> None: ...
+    def read(self, amt: Optional[Any] = ...): ...
+
 class AWSAuthConnection:
     suppress_consec_slashes = ...  # type: Any
-    num_retries = ...  # type: Any
+    num_retries = ...  # type: int
     is_secure = ...  # type: Any
     https_validate_certificates = ...  # type: Any
     ca_certificates_file = ...  # type: Any
@@ -53,7 +58,7 @@ class AWSAuthConnection:
     http_unretryable_exceptions = ...  # type: Any
     socket_exception_values = ...  # type: Any
     https_connection_factory = ...  # type: Any
-    protocol = ...  # type: Any
+    protocol = ...  # type: str
     host = ...  # type: Any
     path = ...  # type: Any
     debug = ...  # type: Any
@@ -62,18 +67,24 @@ class AWSAuthConnection:
     provider = ...  # type: Any
     auth_service_name = ...  # type: Any
     request_hook = ...  # type: Any
-    def __init__(self, host, aws_access_key_id=..., aws_secret_access_key=..., is_secure=..., port=..., proxy=..., proxy_port=..., proxy_user=..., proxy_pass=..., debug=..., https_connection_factory=..., path=..., provider=..., security_token=..., suppress_consec_slashes=..., validate_certs=..., profile_name=...) -> None: ...
+    def __init__(self, host, aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., is_secure: bool = ..., port: Optional[Any] = ..., proxy: Optional[Any] = ..., proxy_port: Optional[Any] = ..., proxy_user: Optional[Any] = ..., proxy_pass: Optional[Any] = ..., debug: int = ..., https_connection_factory: Optional[Any] = ..., path: str = ..., provider: str = ..., security_token: Optional[Any] = ..., suppress_consec_slashes: bool = ..., validate_certs: bool = ..., profile_name: Optional[Any] = ...) -> None: ...
     auth_region_name = ...  # type: Any
+    @property
     def connection(self): ...
+    @property
     def aws_access_key_id(self): ...
-    gs_access_key_id = ...  # type: Any
+    @property
+    def gs_access_key_id(self): ...  # type: Any
     access_key = ...  # type: Any
+    @property
     def aws_secret_access_key(self): ...
-    gs_secret_access_key = ...  # type: Any
+    @property
+    def gs_secret_access_key(self): ...
     secret_key = ...  # type: Any
+    @property
     def profile_name(self): ...
-    def get_path(self, path=...): ...
-    def server_name(self, port=...): ...
+    def get_path(self, path: str = ...): ...
+    def server_name(self, port: Optional[Any] = ...): ...
     proxy = ...  # type: Any
     proxy_port = ...  # type: Any
     proxy_user = ...  # type: Any
@@ -85,24 +96,24 @@ class AWSAuthConnection:
     def skip_proxy(self, host): ...
     def new_http_connection(self, host, port, is_secure): ...
     def put_http_connection(self, host, port, is_secure, connection): ...
-    def proxy_ssl(self, host=..., port=...): ...
-    def prefix_proxy_to_path(self, path, host=...): ...
+    def proxy_ssl(self, host: Optional[Any] = ..., port: Optional[Any] = ...): ...
+    def prefix_proxy_to_path(self, path, host: Optional[Any] = ...): ...
     def get_proxy_auth_header(self): ...
     def get_proxy_url_with_auth(self): ...
     def set_host_header(self, request): ...
     def set_request_hook(self, hook): ...
-    def build_base_http_request(self, method, path, auth_path, params=..., headers=..., data=..., host=...): ...
-    def make_request(self, method, path, headers=..., data=..., host=..., auth_path=..., sender=..., override_num_retries=..., params=..., retry_handler=...): ...
+    def build_base_http_request(self, method, path, auth_path, params: Optional[Any] = ..., headers: Optional[Any] = ..., data: str = ..., host: Optional[Any] = ...): ...
+    def make_request(self, method, path, headers: Optional[Any] = ..., data: str = ..., host: Optional[Any] = ..., auth_path: Optional[Any] = ..., sender: Optional[Any] = ..., override_num_retries: Optional[Any] = ..., params: Optional[Any] = ..., retry_handler: Optional[Any] = ...): ...
     def close(self): ...
 
 class AWSQueryConnection(AWSAuthConnection):
-    APIVersion = ...  # type: Any
+    APIVersion = ...  # type: str
     ResponseError = ...  # type: Any
-    def __init__(self, aws_access_key_id=..., aws_secret_access_key=..., is_secure=..., port=..., proxy=..., proxy_port=..., proxy_user=..., proxy_pass=..., host=..., debug=..., https_connection_factory=..., path=..., security_token=..., validate_certs=..., profile_name=..., provider=...) -> None: ...
+    def __init__(self, aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., is_secure: bool = ..., port: Optional[Any] = ..., proxy: Optional[Any] = ..., proxy_port: Optional[Any] = ..., proxy_user: Optional[Any] = ..., proxy_pass: Optional[Any] = ..., host: Optional[Any] = ..., debug: int = ..., https_connection_factory: Optional[Any] = ..., path: str = ..., security_token: Optional[Any] = ..., validate_certs: bool = ..., profile_name: Optional[Any] = ..., provider: str = ...) -> None: ...
     def get_utf8_value(self, value): ...
-    def make_request(self, action, params=..., path=..., verb=...): ...
+    def make_request(self, action, params: Optional[Any] = ..., path: str = ..., verb: str = ..., *args, **kwargs): ...
     def build_list_params(self, params, items, label): ...
     def build_complex_list_params(self, params, items, label, names): ...
-    def get_list(self, action, params, markers, path=..., parent=..., verb=...): ...
-    def get_object(self, action, params, cls, path=..., parent=..., verb=...): ...
-    def get_status(self, action, params, path=..., parent=..., verb=...): ...
+    def get_list(self, action, params, markers, path: str = ..., parent: Optional[Any] = ..., verb: str = ...): ...
+    def get_object(self, action, params, cls, path: str = ..., parent: Optional[Any] = ..., verb: str = ...): ...
+    def get_status(self, action, params, path: str = ..., parent: Optional[Any] = ..., verb: str = ...): ...
diff --git a/third_party/2/boto/ec2/__init__.pyi b/third_party/2and3/boto/ec2/__init__.pyi
similarity index 100%
rename from third_party/2/boto/ec2/__init__.pyi
rename to third_party/2and3/boto/ec2/__init__.pyi
diff --git a/third_party/2/boto/ec2/elb/__init__.pyi b/third_party/2and3/boto/elb/__init__.pyi
similarity index 100%
rename from third_party/2/boto/ec2/elb/__init__.pyi
rename to third_party/2and3/boto/elb/__init__.pyi
diff --git a/third_party/2/boto/exception.pyi b/third_party/2and3/boto/exception.pyi
similarity index 71%
rename from third_party/2/boto/exception.pyi
rename to third_party/2and3/boto/exception.pyi
index 2a20228f1d59..83778af0300d 100644
--- a/third_party/2/boto/exception.pyi
+++ b/third_party/2and3/boto/exception.pyi
@@ -1,12 +1,13 @@
-# Stubs for boto.exception (Python 2)
+# Stubs for boto.exception (Python 3.5)
 #
 # NOTE: This dynamically typed stub was automatically generated by stubgen.
 
-from typing import Any
+from typing import Any, Optional
+from boto.compat import StandardError
 
 class BotoClientError(StandardError):
     reason = ...  # type: Any
-    def __init__(self, reason, *args): ...
+    def __init__(self, reason, *args) -> None: ...
 
 class SDBPersistenceError(StandardError): ...
 class StoragePermissionsError(BotoClientError): ...
@@ -19,9 +20,9 @@ class BotoServerError(StandardError):
     body = ...  # type: Any
     request_id = ...  # type: Any
     error_code = ...  # type: Any
-    message = ...  # type: Any
+    message = ...  # type: str
     box_usage = ...  # type: Any
-    def __init__(self, status, reason, body=None, *args): ...
+    def __init__(self, status, reason, body: Optional[Any] = ..., *args) -> None: ...
     def __getattr__(self, name): ...
     def __setattr__(self, name, value): ...
     def startElement(self, name, attrs, connection): ...
@@ -33,13 +34,13 @@ class ConsoleOutput:
     timestamp = ...  # type: Any
     comment = ...  # type: Any
     output = ...  # type: Any
-    def __init__(self, parent=None): ...
+    def __init__(self, parent: Optional[Any] = ...) -> None: ...
     def startElement(self, name, attrs, connection): ...
     def endElement(self, name, value, connection): ...
 
 class StorageCreateError(BotoServerError):
     bucket = ...  # type: Any
-    def __init__(self, status, reason, body=None): ...
+    def __init__(self, status, reason, body: Optional[Any] = ...) -> None: ...
     def endElement(self, name, value, connection): ...
 
 class S3CreateError(StorageCreateError): ...
@@ -51,17 +52,17 @@ class GSCopyError(StorageCopyError): ...
 class SQSError(BotoServerError):
     detail = ...  # type: Any
     type = ...  # type: Any
-    def __init__(self, status, reason, body=None): ...
+    def __init__(self, status, reason, body: Optional[Any] = ...) -> None: ...
     def startElement(self, name, attrs, connection): ...
     def endElement(self, name, value, connection): ...
 
 class SQSDecodeError(BotoClientError):
     message = ...  # type: Any
-    def __init__(self, reason, message): ...
+    def __init__(self, reason, message) -> None: ...
 
 class StorageResponseError(BotoServerError):
     resource = ...  # type: Any
-    def __init__(self, status, reason, body=None): ...
+    def __init__(self, status, reason, body: Optional[Any] = ...) -> None: ...
     def startElement(self, name, attrs, connection): ...
     def endElement(self, name, value, connection): ...
 
@@ -70,7 +71,7 @@ class GSResponseError(StorageResponseError): ...
 
 class EC2ResponseError(BotoServerError):
     errors = ...  # type: Any
-    def __init__(self, status, reason, body=None): ...
+    def __init__(self, status, reason, body: Optional[Any] = ...) -> None: ...
     def startElement(self, name, attrs, connection): ...
     request_id = ...  # type: Any
     def endElement(self, name, value, connection): ...
@@ -81,7 +82,7 @@ class JSONResponseError(BotoServerError):
     body = ...  # type: Any
     error_message = ...  # type: Any
     error_code = ...  # type: Any
-    def __init__(self, status, reason, body=None, *args): ...
+    def __init__(self, status, reason, body: Optional[Any] = ..., *args) -> None: ...
 
 class DynamoDBResponseError(JSONResponseError): ...
 class SWFResponseError(JSONResponseError): ...
@@ -91,7 +92,7 @@ class _EC2Error:
     connection = ...  # type: Any
     error_code = ...  # type: Any
     error_message = ...  # type: Any
-    def __init__(self, connection=None): ...
+    def __init__(self, connection: Optional[Any] = ...) -> None: ...
     def startElement(self, name, attrs, connection): ...
     def endElement(self, name, value, connection): ...
 
@@ -103,47 +104,47 @@ class GSDataError(StorageDataError): ...
 
 class InvalidUriError(Exception):
     message = ...  # type: Any
-    def __init__(self, message): ...
+    def __init__(self, message) -> None: ...
 
 class InvalidAclError(Exception):
     message = ...  # type: Any
-    def __init__(self, message): ...
+    def __init__(self, message) -> None: ...
 
 class InvalidCorsError(Exception):
     message = ...  # type: Any
-    def __init__(self, message): ...
+    def __init__(self, message) -> None: ...
 
 class NoAuthHandlerFound(Exception): ...
 
 class InvalidLifecycleConfigError(Exception):
     message = ...  # type: Any
-    def __init__(self, message): ...
+    def __init__(self, message) -> None: ...
 
 class ResumableTransferDisposition:
-    START_OVER = ...  # type: Any
-    WAIT_BEFORE_RETRY = ...  # type: Any
-    ABORT_CUR_PROCESS = ...  # type: Any
-    ABORT = ...  # type: Any
+    START_OVER = ...  # type: str
+    WAIT_BEFORE_RETRY = ...  # type: str
+    ABORT_CUR_PROCESS = ...  # type: str
+    ABORT = ...  # type: str
 
 class ResumableUploadException(Exception):
     message = ...  # type: Any
     disposition = ...  # type: Any
-    def __init__(self, message, disposition): ...
+    def __init__(self, message, disposition) -> None: ...
 
 class ResumableDownloadException(Exception):
     message = ...  # type: Any
     disposition = ...  # type: Any
-    def __init__(self, message, disposition): ...
+    def __init__(self, message, disposition) -> None: ...
 
 class TooManyRecordsException(Exception):
     message = ...  # type: Any
-    def __init__(self, message): ...
+    def __init__(self, message) -> None: ...
 
 class PleaseRetryException(Exception):
     message = ...  # type: Any
     response = ...  # type: Any
-    def __init__(self, message, response=None): ...
+    def __init__(self, message, response: Optional[Any] = ...) -> None: ...
 
 class InvalidInstanceMetadataError(Exception):
-    MSG = ...  # type: Any
-    def __init__(self, msg): ...
+    MSG = ...  # type: str
+    def __init__(self, msg) -> None: ...
diff --git a/third_party/2and3/boto/plugin.pyi b/third_party/2and3/boto/plugin.pyi
new file mode 100644
index 000000000000..37b972197e90
--- /dev/null
+++ b/third_party/2and3/boto/plugin.pyi
@@ -0,0 +1,13 @@
+# Stubs for boto.plugin (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class Plugin:
+    capability = ...  # type: Any
+    @classmethod
+    def is_capable(cls, requested_capability): ...
+
+def get_plugin(cls, requested_capability: Optional[Any] = ...): ...
+def load_plugins(config): ...
diff --git a/third_party/2and3/boto/regioninfo.pyi b/third_party/2and3/boto/regioninfo.pyi
new file mode 100644
index 000000000000..9dbb46f43538
--- /dev/null
+++ b/third_party/2and3/boto/regioninfo.pyi
@@ -0,0 +1,20 @@
+# Stubs for boto.regioninfo (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+def load_endpoint_json(path): ...
+def merge_endpoints(defaults, additions): ...
+def load_regions(): ...
+def get_regions(service_name, region_cls: Optional[Any] = ..., connection_cls: Optional[Any] = ...): ...
+
+class RegionInfo:
+    connection = ...  # type: Any
+    name = ...  # type: Any
+    endpoint = ...  # type: Any
+    connection_cls = ...  # type: Any
+    def __init__(self, connection: Optional[Any] = ..., name: Optional[Any] = ..., endpoint: Optional[Any] = ..., connection_cls: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def connect(self, **kw_params): ...
diff --git a/third_party/2and3/boto/s3/__init__.pyi b/third_party/2and3/boto/s3/__init__.pyi
new file mode 100644
index 000000000000..b359694a4e68
--- /dev/null
+++ b/third_party/2and3/boto/s3/__init__.pyi
@@ -0,0 +1,16 @@
+# Stubs for boto.s3 (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from .connection import S3Connection
+
+from boto.connection import AWSAuthConnection
+from boto.regioninfo import RegionInfo
+
+from typing import List, Type, Text
+
+class S3RegionInfo(RegionInfo):
+    def connect(self, name: Text=None, endpoint: str=None, connection_cls: Type[AWSAuthConnection]=None, **kw_params) -> S3Connection: ...
+
+def regions() -> List[S3RegionInfo]: ...
+def connect_to_region(region_name: Text, **kw_params): ...
diff --git a/third_party/2and3/boto/s3/acl.pyi b/third_party/2and3/boto/s3/acl.pyi
new file mode 100644
index 000000000000..8813009223dd
--- /dev/null
+++ b/third_party/2and3/boto/s3/acl.pyi
@@ -0,0 +1,43 @@
+# Stubs for boto.s3.acl (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from .connection import S3Connection
+from .user import User
+from typing import Any, Dict, Optional, List, Text, Union
+
+CannedACLStrings = ...  # type: List[str]
+
+class Policy:
+    parent = ...  # type: Any
+    namespace = ...  # type: Any
+    acl = ...  # type: ACL
+    def __init__(self, parent: Optional[Any] = ...) -> None: ...
+    owner = ...  # type: User
+    def startElement(self, name: Text, attrs: Dict[str, Any], connection: S3Connection) -> Union[None, User, ACL]: ...
+    def endElement(self, name: Text, value: Any, connection: S3Connection) -> None: ...
+    def to_xml(self) -> str: ...
+
+class ACL:
+    policy = ...  # type: Policy
+    grants = ...  # type: List[Grant]
+    def __init__(self, policy: Optional[Policy] = ...) -> None: ...
+    def add_grant(self, grant: Grant) -> None: ...
+    def add_email_grant(self, permission: Text, email_address: Text) -> None: ...
+    def add_user_grant(self, permission: Text, user_id: Text, display_name: Optional[Text] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name: Text, value: Any, connection: S3Connection) -> None: ...
+    def to_xml(self) -> str: ...
+
+class Grant:
+    NameSpace = ...  # type: Text
+    permission = ...  # type: Text
+    id = ...  # type: Text
+    display_name = ...  # type: Text
+    uri = ...  # type: Text
+    email_address = ...  # type: Text
+    type = ...  # type: Text
+    def __init__(self, permission: Optional[Text] = ..., type: Optional[Text] = ..., id: Optional[Text] = ..., display_name: Optional[Text] = ..., uri: Optional[Text] = ..., email_address: Optional[Text] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name: Text, value: Any, connection: S3Connection) -> None: ...
+    def to_xml(self) -> str: ...
diff --git a/third_party/2and3/boto/s3/bucket.pyi b/third_party/2and3/boto/s3/bucket.pyi
new file mode 100644
index 000000000000..3b6efb6f8437
--- /dev/null
+++ b/third_party/2and3/boto/s3/bucket.pyi
@@ -0,0 +1,98 @@
+# Stubs for boto.s3.bucket (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from .bucketlistresultset import BucketListResultSet
+from .connection import S3Connection
+from .key import Key
+
+from typing import Any, Dict, Optional, Text, Type
+
+class S3WebsiteEndpointTranslate:
+    trans_region = ...  # type: Dict[str, str]
+    @classmethod
+    def translate_region(self, reg: Text) -> str: ...
+
+S3Permissions = ...  # type: List[str]
+
+class Bucket:
+    LoggingGroup = ...  # type: str
+    BucketPaymentBody = ...  # type: str
+    VersioningBody = ...  # type: str
+    VersionRE = ...  # type: str
+    MFADeleteRE = ...  # type: str
+    name = ...  # type: Text
+    connection = ...  # type: S3Connection
+    key_class = ...  # type: Type[Key]
+    def __init__(self, connection: Optional[S3Connection] = ..., name: Optional[Text] = ..., key_class: Type[Key] = ...) -> None: ...
+    def __iter__(self): ...
+    def __contains__(self, key_name) -> bool: ...
+    def startElement(self, name, attrs, connection): ...
+    creation_date = ...  # type: Any
+    def endElement(self, name, value, connection): ...
+    def set_key_class(self, key_class): ...
+    def lookup(self, key_name, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_key(self, key_name, headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ..., response_headers: Optional[Dict[Text, Text]] = ..., validate: bool = ...) -> Key: ...
+    def list(self, prefix: Text = ..., delimiter: Text = ..., marker: Text = ..., headers: Optional[Dict[Text, Text]] = ..., encoding_type: Optional[Any] = ...) -> BucketListResultSet: ...
+    def list_versions(self, prefix: str = ..., delimiter: str = ..., key_marker: str = ..., version_id_marker: str = ..., headers: Optional[Dict[Text, Text]] = ..., encoding_type: Optional[Text] = ...) -> BucketListResultSet: ...
+    def list_multipart_uploads(self, key_marker: str = ..., upload_id_marker: str = ..., headers: Optional[Dict[Text, Text]] = ..., encoding_type: Optional[Any] = ...): ...
+    def validate_kwarg_names(self, kwargs, names): ...
+    def get_all_keys(self, headers: Optional[Dict[Text, Text]] = ..., **params): ...
+    def get_all_versions(self, headers: Optional[Dict[Text, Text]] = ..., **params): ...
+    def validate_get_all_versions_params(self, params): ...
+    def get_all_multipart_uploads(self, headers: Optional[Dict[Text, Text]] = ..., **params): ...
+    def new_key(self, key_name: Optional[Any] = ...): ...
+    def generate_url(self, expires_in, method: str = ..., headers: Optional[Dict[Text, Text]] = ..., force_http: bool = ..., response_headers: Optional[Dict[Text, Text]] = ..., expires_in_absolute: bool = ...): ...
+    def delete_keys(self, keys, quiet: bool = ..., mfa_token: Optional[Any] = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete_key(self, key_name, headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ..., mfa_token: Optional[Any] = ...): ...
+    def copy_key(self, new_key_name, src_bucket_name, src_key_name, metadata: Optional[Any] = ..., src_version_id: Optional[Any] = ..., storage_class: str = ..., preserve_acl: bool = ..., encrypt_key: bool = ..., headers: Optional[Dict[Text, Text]] = ..., query_args: Optional[Any] = ...): ...
+    def set_canned_acl(self, acl_str, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ...): ...
+    def get_xml_acl(self, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ...): ...
+    def set_xml_acl(self, acl_str, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ..., query_args: str = ...): ...
+    def set_acl(self, acl_or_str, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ...): ...
+    def get_acl(self, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ...): ...
+    def set_subresource(self, subresource, value, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ...): ...
+    def get_subresource(self, subresource, key_name: str = ..., headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ...): ...
+    def make_public(self, recursive: bool = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def add_email_grant(self, permission, email_address, recursive: bool = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def add_user_grant(self, permission, user_id, recursive: bool = ..., headers: Optional[Dict[Text, Text]] = ..., display_name: Optional[Any] = ...): ...
+    def list_grants(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_location(self): ...
+    def set_xml_logging(self, logging_str, headers: Optional[Dict[Text, Text]] = ...): ...
+    def enable_logging(self, target_bucket, target_prefix: str = ..., grants: Optional[Any] = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def disable_logging(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_logging_status(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_as_logging_target(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_request_payment(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_request_payment(self, payer: str = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def configure_versioning(self, versioning, mfa_delete: bool = ..., mfa_token: Optional[Any] = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_versioning_status(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def configure_lifecycle(self, lifecycle_config, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_lifecycle_config(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete_lifecycle_configuration(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def configure_website(self, suffix: Optional[Any] = ..., error_key: Optional[Any] = ..., redirect_all_requests_to: Optional[Any] = ..., routing_rules: Optional[Any] = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_website_configuration(self, config, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_website_configuration_xml(self, xml, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_website_configuration(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_website_configuration_obj(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_website_configuration_with_xml(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_website_configuration_xml(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete_website_configuration(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_website_endpoint(self): ...
+    def get_policy(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_policy(self, policy, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete_policy(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_cors_xml(self, cors_xml, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_cors(self, cors_config, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_cors_xml(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_cors(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete_cors(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def initiate_multipart_upload(self, key_name, headers: Optional[Dict[Text, Text]] = ..., reduced_redundancy: bool = ..., metadata: Optional[Any] = ..., encrypt_key: bool = ..., policy: Optional[Any] = ...): ...
+    def complete_multipart_upload(self, key_name, upload_id, xml_body, headers: Optional[Dict[Text, Text]] = ...): ...
+    def cancel_multipart_upload(self, key_name, upload_id, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_tags(self): ...
+    def get_xml_tags(self): ...
+    def set_xml_tags(self, tag_str, headers: Optional[Dict[Text, Text]] = ..., query_args: str = ...): ...
+    def set_tags(self, tags, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete_tags(self, headers: Optional[Dict[Text, Text]] = ...): ...
diff --git a/third_party/2and3/boto/s3/bucketlistresultset.pyi b/third_party/2and3/boto/s3/bucketlistresultset.pyi
new file mode 100644
index 000000000000..97e79b0fd153
--- /dev/null
+++ b/third_party/2and3/boto/s3/bucketlistresultset.pyi
@@ -0,0 +1,44 @@
+# Stubs for boto.s3.bucketlistresultset (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from .bucket import Bucket
+from .key import Key
+
+from typing import Any, Iterable, Iterator, Optional
+
+def bucket_lister(bucket, prefix: str = ..., delimiter: str = ..., marker: str = ..., headers: Optional[Any] = ..., encoding_type: Optional[Any] = ...): ...
+
+class BucketListResultSet(Iterable[Key]):
+    bucket = ...  # type: Any
+    prefix = ...  # type: Any
+    delimiter = ...  # type: Any
+    marker = ...  # type: Any
+    headers = ...  # type: Any
+    encoding_type = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ..., prefix: str = ..., delimiter: str = ..., marker: str = ..., headers: Optional[Any] = ..., encoding_type: Optional[Any] = ...) -> None: ...
+    def __iter__(self) -> Iterator[Key]: ...
+
+def versioned_bucket_lister(bucket, prefix: str = ..., delimiter: str = ..., key_marker: str = ..., version_id_marker: str = ..., headers: Optional[Any] = ..., encoding_type: Optional[Any] = ...): ...
+
+class VersionedBucketListResultSet:
+    bucket = ...  # type: Any
+    prefix = ...  # type: Any
+    delimiter = ...  # type: Any
+    key_marker = ...  # type: Any
+    version_id_marker = ...  # type: Any
+    headers = ...  # type: Any
+    encoding_type = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ..., prefix: str = ..., delimiter: str = ..., key_marker: str = ..., version_id_marker: str = ..., headers: Optional[Any] = ..., encoding_type: Optional[Any] = ...) -> None: ...
+    def __iter__(self) -> Iterator[Key]: ...
+
+def multipart_upload_lister(bucket, key_marker: str = ..., upload_id_marker: str = ..., headers: Optional[Any] = ..., encoding_type: Optional[Any] = ...): ...
+
+class MultiPartUploadListResultSet:
+    bucket = ...  # type: Any
+    key_marker = ...  # type: Any
+    upload_id_marker = ...  # type: Any
+    headers = ...  # type: Any
+    encoding_type = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ..., key_marker: str = ..., upload_id_marker: str = ..., headers: Optional[Any] = ..., encoding_type: Optional[Any] = ...) -> None: ...
+    def __iter__(self): ...
diff --git a/third_party/2and3/boto/s3/bucketlogging.pyi b/third_party/2and3/boto/s3/bucketlogging.pyi
new file mode 100644
index 000000000000..a3f83a58b820
--- /dev/null
+++ b/third_party/2and3/boto/s3/bucketlogging.pyi
@@ -0,0 +1,15 @@
+# Stubs for boto.s3.bucketlogging (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class BucketLogging:
+    target = ...  # type: Any
+    prefix = ...  # type: Any
+    grants = ...  # type: Any
+    def __init__(self, target: Optional[Any] = ..., prefix: Optional[Any] = ..., grants: Optional[Any] = ...) -> None: ...
+    def add_grant(self, grant): ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
diff --git a/third_party/2and3/boto/s3/connection.pyi b/third_party/2and3/boto/s3/connection.pyi
new file mode 100644
index 000000000000..b9df2cbf1dd5
--- /dev/null
+++ b/third_party/2and3/boto/s3/connection.pyi
@@ -0,0 +1,71 @@
+# Stubs for boto.s3.connection (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from .bucket import Bucket
+
+from typing import Any, Optional, Text, Type
+from boto.connection import AWSAuthConnection
+from boto.exception import BotoClientError
+
+def check_lowercase_bucketname(n): ...
+def assert_case_insensitive(f): ...
+
+class _CallingFormat:
+    def get_bucket_server(self, server, bucket): ...
+    def build_url_base(self, connection, protocol, server, bucket, key: str = ...): ...
+    def build_host(self, server, bucket): ...
+    def build_auth_path(self, bucket, key: str = ...): ...
+    def build_path_base(self, bucket, key: str = ...): ...
+
+class SubdomainCallingFormat(_CallingFormat):
+    def get_bucket_server(self, server, bucket): ...
+
+class VHostCallingFormat(_CallingFormat):
+    def get_bucket_server(self, server, bucket): ...
+
+class OrdinaryCallingFormat(_CallingFormat):
+    def get_bucket_server(self, server, bucket): ...
+    def build_path_base(self, bucket, key: str = ...): ...
+
+class ProtocolIndependentOrdinaryCallingFormat(OrdinaryCallingFormat):
+    def build_url_base(self, connection, protocol, server, bucket, key: str = ...): ...
+
+class Location:
+    DEFAULT = ...  # type: str
+    EU = ...  # type: str
+    EUCentral1 = ...  # type: str
+    USWest = ...  # type: str
+    USWest2 = ...  # type: str
+    SAEast = ...  # type: str
+    APNortheast = ...  # type: str
+    APSoutheast = ...  # type: str
+    APSoutheast2 = ...  # type: str
+    CNNorth1 = ...  # type: str
+
+class NoHostProvided: ...
+class HostRequiredError(BotoClientError): ...
+
+class S3Connection(AWSAuthConnection):
+    DefaultHost = ...  # type: Any
+    DefaultCallingFormat = ...  # type: Any
+    QueryString = ...  # type: str
+    calling_format = ...  # type: Any
+    bucket_class = ...  # type: Type[Bucket]
+    anon = ...  # type: Any
+    def __init__(self, aws_access_key_id: Optional[Any] = ..., aws_secret_access_key: Optional[Any] = ..., is_secure: bool = ..., port: Optional[Any] = ..., proxy: Optional[Any] = ..., proxy_port: Optional[Any] = ..., proxy_user: Optional[Any] = ..., proxy_pass: Optional[Any] = ..., host: Any = ..., debug: int = ..., https_connection_factory: Optional[Any] = ..., calling_format: Any = ..., path: str = ..., provider: str = ..., bucket_class: Type[Bucket] = ..., security_token: Optional[Any] = ..., suppress_consec_slashes: bool = ..., anon: bool = ..., validate_certs: Optional[Any] = ..., profile_name: Optional[Any] = ...) -> None: ...
+    def __iter__(self): ...
+    def __contains__(self, bucket_name): ...
+    def set_bucket_class(self, bucket_class: Type[Bucket]) -> None: ...
+    def build_post_policy(self, expiration_time, conditions): ...
+    def build_post_form_args(self, bucket_name, key, expires_in: int = ..., acl: Optional[Any] = ..., success_action_redirect: Optional[Any] = ..., max_content_length: Optional[Any] = ..., http_method: str = ..., fields: Optional[Any] = ..., conditions: Optional[Any] = ..., storage_class: str = ..., server_side_encryption: Optional[Any] = ...): ...
+    def generate_url_sigv4(self, expires_in, method, bucket: str = ..., key: str = ..., headers: Optional[Dict[Text, Text]] = ..., force_http: bool = ..., response_headers: Optional[Dict[Text, Text]] = ..., version_id: Optional[Any] = ..., iso_date: Optional[Any] = ...): ...
+    def generate_url(self, expires_in, method, bucket: str = ..., key: str = ..., headers: Optional[Dict[Text, Text]] = ..., query_auth: bool = ..., force_http: bool = ..., response_headers: Optional[Dict[Text, Text]] = ..., expires_in_absolute: bool = ..., version_id: Optional[Any] = ...): ...
+    def get_all_buckets(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_canonical_user_id(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_bucket(self, bucket_name: Text, validate: bool = ..., headers: Optional[Dict[Text, Text]] = ...) -> Bucket: ...
+    def head_bucket(self, bucket_name, headers: Optional[Dict[Text, Text]] = ...): ...
+    def lookup(self, bucket_name, validate: bool = ..., headers: Optional[Dict[Text, Text]] = ...): ...
+    def create_bucket(self, bucket_name, headers: Optional[Dict[Text, Text]] = ..., location: Any = ..., policy: Optional[Any] = ...): ...
+    def delete_bucket(self, bucket, headers: Optional[Dict[Text, Text]] = ...): ...
+    def make_request(self, method, bucket: str = ..., key: str = ..., headers: Optional[Any] = ..., data: str = ..., query_args: Optional[Any] = ..., sender: Optional[Any] = ..., override_num_retries: Optional[Any] = ..., retry_handler: Optional[Any] = ..., *args, **kwargs): ...
diff --git a/third_party/2and3/boto/s3/cors.pyi b/third_party/2and3/boto/s3/cors.pyi
new file mode 100644
index 000000000000..07f49b09cdeb
--- /dev/null
+++ b/third_party/2and3/boto/s3/cors.pyi
@@ -0,0 +1,23 @@
+# Stubs for boto.s3.cors (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class CORSRule:
+    allowed_method = ...  # type: Any
+    allowed_origin = ...  # type: Any
+    id = ...  # type: Any
+    allowed_header = ...  # type: Any
+    max_age_seconds = ...  # type: Any
+    expose_header = ...  # type: Any
+    def __init__(self, allowed_method: Optional[Any] = ..., allowed_origin: Optional[Any] = ..., id: Optional[Any] = ..., allowed_header: Optional[Any] = ..., max_age_seconds: Optional[Any] = ..., expose_header: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self) -> str: ...
+
+class CORSConfiguration(list):
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self) -> str: ...
+    def add_rule(self, allowed_method, allowed_origin, id: Optional[Any] = ..., allowed_header: Optional[Any] = ..., max_age_seconds: Optional[Any] = ..., expose_header: Optional[Any] = ...): ...
diff --git a/third_party/2and3/boto/s3/deletemarker.pyi b/third_party/2and3/boto/s3/deletemarker.pyi
new file mode 100644
index 000000000000..cf7bc64d597f
--- /dev/null
+++ b/third_party/2and3/boto/s3/deletemarker.pyi
@@ -0,0 +1,16 @@
+# Stubs for boto.s3.deletemarker (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class DeleteMarker:
+    bucket = ...  # type: Any
+    name = ...  # type: Any
+    version_id = ...  # type: Any
+    is_latest = ...  # type: bool
+    last_modified = ...  # type: Any
+    owner = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ..., name: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
diff --git a/third_party/2and3/boto/s3/key.pyi b/third_party/2and3/boto/s3/key.pyi
new file mode 100644
index 000000000000..f7232b7811b6
--- /dev/null
+++ b/third_party/2and3/boto/s3/key.pyi
@@ -0,0 +1,91 @@
+# Stubs for boto.s3.key (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Callable, Dict, Optional, Text
+
+class Key:
+    DefaultContentType = ...  # type: str
+    RestoreBody = ...  # type: str
+    BufferSize = ...  # type: Any
+    base_user_settable_fields = ...  # type: Any
+    base_fields = ...  # type: Any
+    bucket = ...  # type: Any
+    name = ...  # type: str
+    metadata = ...  # type: Any
+    cache_control = ...  # type: Any
+    content_type = ...  # type: Any
+    content_encoding = ...  # type: Any
+    content_disposition = ...  # type: Any
+    content_language = ...  # type: Any
+    filename = ...  # type: Any
+    etag = ...  # type: Any
+    is_latest = ...  # type: bool
+    last_modified = ...  # type: Any
+    owner = ...  # type: Any
+    path = ...  # type: Any
+    resp = ...  # type: Any
+    mode = ...  # type: Any
+    size = ...  # type: Any
+    version_id = ...  # type: Any
+    source_version_id = ...  # type: Any
+    delete_marker = ...  # type: bool
+    encrypted = ...  # type: Any
+    ongoing_restore = ...  # type: Any
+    expiry_date = ...  # type: Any
+    local_hashes = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ..., name: Optional[Any] = ...) -> None: ...
+    def __iter__(self): ...
+    @property
+    def provider(self): ...
+    key = ...  # type: Any
+    md5 = ...  # type: Any
+    base64md5 = ...  # type: Any
+    storage_class = ...  # type: Any
+    def get_md5_from_hexdigest(self, md5_hexdigest): ...
+    def handle_encryption_headers(self, resp): ...
+    def handle_version_headers(self, resp, force: bool = ...): ...
+    def handle_restore_headers(self, response): ...
+    def handle_addl_headers(self, headers): ...
+    def open_read(self, headers: Optional[Dict[Text, Text]] = ..., query_args: str = ..., override_num_retries: Optional[Any] = ..., response_headers: Optional[Dict[Text, Text]] = ...): ...
+    def open_write(self, headers: Optional[Dict[Text, Text]] = ..., override_num_retries: Optional[Any] = ...): ...
+    def open(self, mode: str = ..., headers: Optional[Dict[Text, Text]] = ..., query_args: Optional[Any] = ..., override_num_retries: Optional[Any] = ...): ...
+    closed = ...  # type: bool
+    def close(self, fast: bool = ...): ...
+    def next(self): ...
+    __next__ = ...  # type: Any
+    def read(self, size: int = ...): ...
+    def change_storage_class(self, new_storage_class, dst_bucket: Optional[Any] = ..., validate_dst_bucket: bool = ...): ...
+    def copy(self, dst_bucket, dst_key, metadata: Optional[Any] = ..., reduced_redundancy: bool = ..., preserve_acl: bool = ..., encrypt_key: bool = ..., validate_dst_bucket: bool = ...): ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def exists(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def delete(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_metadata(self, name): ...
+    def set_metadata(self, name, value): ...
+    def update_metadata(self, d): ...
+    def set_acl(self, acl_str, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_acl(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_xml_acl(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_xml_acl(self, acl_str, headers: Optional[Dict[Text, Text]] = ...): ...
+    def set_canned_acl(self, acl_str, headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_redirect(self): ...
+    def set_redirect(self, redirect_location, headers: Optional[Dict[Text, Text]] = ...): ...
+    def make_public(self, headers: Optional[Dict[Text, Text]] = ...): ...
+    def generate_url(self, expires_in, method: str = ..., headers: Optional[Dict[Text, Text]] = ..., query_auth: bool = ..., force_http: bool = ..., response_headers: Optional[Dict[Text, Text]] = ..., expires_in_absolute: bool = ..., version_id: Optional[Any] = ..., policy: Optional[Any] = ..., reduced_redundancy: bool = ..., encrypt_key: bool = ...): ...
+    def send_file(self, fp, headers: Optional[Dict[Text, Text]] = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., query_args: Optional[Any] = ..., chunked_transfer: bool = ..., size: Optional[Any] = ...): ...
+    def should_retry(self, response, chunked_transfer: bool = ...): ...
+    def compute_md5(self, fp, size: Optional[Any] = ...): ...
+    def set_contents_from_stream(self, fp, headers: Optional[Dict[Text, Text]] = ..., replace: bool = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., policy: Optional[Any] = ..., reduced_redundancy: bool = ..., query_args: Optional[Any] = ..., size: Optional[Any] = ...): ...
+    def set_contents_from_file(self, fp, headers: Optional[Dict[Text, Text]] = ..., replace: bool = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., policy: Optional[Any] = ..., md5: Optional[Any] = ..., reduced_redundancy: bool = ..., query_args: Optional[Any] = ..., encrypt_key: bool = ..., size: Optional[Any] = ..., rewind: bool = ...): ...
+    def set_contents_from_filename(self, filename, headers: Optional[Dict[Text, Text]] = ..., replace: bool = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., policy: Optional[Any] = ..., md5: Optional[Any] = ..., reduced_redundancy: bool = ..., encrypt_key: bool = ...): ...
+    def set_contents_from_string(self, string_data: Text, headers: Optional[Dict[Text, Text]] = ..., replace: bool = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., policy: Optional[Any] = ..., md5: Optional[Any] = ..., reduced_redundancy: bool = ..., encrypt_key: bool = ...) -> None: ...
+    def get_file(self, fp, headers: Optional[Dict[Text, Text]] = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., torrent: bool = ..., version_id: Optional[Any] = ..., override_num_retries: Optional[Any] = ..., response_headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_torrent_file(self, fp, headers: Optional[Dict[Text, Text]] = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ...): ...
+    def get_contents_to_file(self, fp, headers: Optional[Dict[Text, Text]] = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., torrent: bool = ..., version_id: Optional[Any] = ..., res_download_handler: Optional[Any] = ..., response_headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_contents_to_filename(self, filename, headers: Optional[Dict[Text, Text]] = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., torrent: bool = ..., version_id: Optional[Any] = ..., res_download_handler: Optional[Any] = ..., response_headers: Optional[Dict[Text, Text]] = ...): ...
+    def get_contents_as_string(self, headers: Optional[Dict[Text, Text]] = ..., cb: Optional[Callable[[int, int], Any]] = ..., num_cb: int = ..., torrent: bool = ..., version_id: Optional[Any] = ..., response_headers: Optional[Dict[Text, Text]] = ..., encoding: Optional[Any] = ...) -> str: ...
+    def add_email_grant(self, permission, email_address, headers: Optional[Dict[Text, Text]] = ...): ...
+    def add_user_grant(self, permission, user_id, headers: Optional[Dict[Text, Text]] = ..., display_name: Optional[Any] = ...): ...
+    def set_remote_metadata(self, metadata_plus, metadata_minus, preserve_acl, headers: Optional[Dict[Text, Text]] = ...): ...
+    def restore(self, days, headers: Optional[Dict[Text, Text]] = ...): ...
diff --git a/third_party/2and3/boto/s3/keyfile.pyi b/third_party/2and3/boto/s3/keyfile.pyi
new file mode 100644
index 000000000000..2fe5faa835f5
--- /dev/null
+++ b/third_party/2and3/boto/s3/keyfile.pyi
@@ -0,0 +1,33 @@
+# Stubs for boto.s3.keyfile (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any
+
+class KeyFile:
+    key = ...  # type: Any
+    location = ...  # type: int
+    closed = ...  # type: bool
+    softspace = ...  # type: int
+    mode = ...  # type: str
+    encoding = ...  # type: str
+    errors = ...  # type: str
+    newlines = ...  # type: str
+    name = ...  # type: Any
+    def __init__(self, key) -> None: ...
+    def tell(self): ...
+    def seek(self, pos, whence: Any = ...): ...
+    def read(self, size): ...
+    def close(self): ...
+    def isatty(self): ...
+    def getkey(self): ...
+    def write(self, buf): ...
+    def fileno(self): ...
+    def flush(self): ...
+    def next(self): ...
+    def readinto(self): ...
+    def readline(self): ...
+    def readlines(self): ...
+    def truncate(self): ...
+    def writelines(self): ...
+    def xreadlines(self): ...
diff --git a/third_party/2and3/boto/s3/lifecycle.pyi b/third_party/2and3/boto/s3/lifecycle.pyi
new file mode 100644
index 000000000000..c15048e96a99
--- /dev/null
+++ b/third_party/2and3/boto/s3/lifecycle.pyi
@@ -0,0 +1,55 @@
+# Stubs for boto.s3.lifecycle (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class Rule:
+    id = ...  # type: Any
+    prefix = ...  # type: Any
+    status = ...  # type: Any
+    expiration = ...  # type: Any
+    transition = ...  # type: Any
+    def __init__(self, id: Optional[Any] = ..., prefix: Optional[Any] = ..., status: Optional[Any] = ..., expiration: Optional[Any] = ..., transition: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+
+class Expiration:
+    days = ...  # type: Any
+    date = ...  # type: Any
+    def __init__(self, days: Optional[Any] = ..., date: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+
+class Transition:
+    days = ...  # type: Any
+    date = ...  # type: Any
+    storage_class = ...  # type: Any
+    def __init__(self, days: Optional[Any] = ..., date: Optional[Any] = ..., storage_class: Optional[Any] = ...) -> None: ...
+    def to_xml(self): ...
+
+class Transitions(list):
+    transition_properties = ...  # type: int
+    current_transition_property = ...  # type: int
+    temp_days = ...  # type: Any
+    temp_date = ...  # type: Any
+    temp_storage_class = ...  # type: Any
+    def __init__(self) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+    def add_transition(self, days: Optional[Any] = ..., date: Optional[Any] = ..., storage_class: Optional[Any] = ...): ...
+    @property
+    def days(self): ...
+    @property
+    def date(self): ...
+    @property
+    def storage_class(self): ...
+
+class Lifecycle(list):
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+    def add_rule(self, id: Optional[Any] = ..., prefix: str = ..., status: str = ..., expiration: Optional[Any] = ..., transition: Optional[Any] = ...): ...
diff --git a/third_party/2and3/boto/s3/multidelete.pyi b/third_party/2and3/boto/s3/multidelete.pyi
new file mode 100644
index 000000000000..46449c44fee4
--- /dev/null
+++ b/third_party/2and3/boto/s3/multidelete.pyi
@@ -0,0 +1,31 @@
+# Stubs for boto.s3.multidelete (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class Deleted:
+    key = ...  # type: Any
+    version_id = ...  # type: Any
+    delete_marker = ...  # type: Any
+    delete_marker_version_id = ...  # type: Any
+    def __init__(self, key: Optional[Any] = ..., version_id: Optional[Any] = ..., delete_marker: bool = ..., delete_marker_version_id: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+
+class Error:
+    key = ...  # type: Any
+    version_id = ...  # type: Any
+    code = ...  # type: Any
+    message = ...  # type: Any
+    def __init__(self, key: Optional[Any] = ..., version_id: Optional[Any] = ..., code: Optional[Any] = ..., message: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+
+class MultiDeleteResult:
+    bucket = ...  # type: Any
+    deleted = ...  # type: Any
+    errors = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
diff --git a/third_party/2and3/boto/s3/multipart.pyi b/third_party/2and3/boto/s3/multipart.pyi
new file mode 100644
index 000000000000..2bc738f3abc7
--- /dev/null
+++ b/third_party/2and3/boto/s3/multipart.pyi
@@ -0,0 +1,53 @@
+# Stubs for boto.s3.multipart (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class CompleteMultiPartUpload:
+    bucket = ...  # type: Any
+    location = ...  # type: Any
+    bucket_name = ...  # type: Any
+    key_name = ...  # type: Any
+    etag = ...  # type: Any
+    version_id = ...  # type: Any
+    encrypted = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+
+class Part:
+    bucket = ...  # type: Any
+    part_number = ...  # type: Any
+    last_modified = ...  # type: Any
+    etag = ...  # type: Any
+    size = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+
+def part_lister(mpupload, part_number_marker: Optional[Any] = ...): ...
+
+class MultiPartUpload:
+    bucket = ...  # type: Any
+    bucket_name = ...  # type: Any
+    key_name = ...  # type: Any
+    id = ...  # type: Any
+    initiator = ...  # type: Any
+    owner = ...  # type: Any
+    storage_class = ...  # type: Any
+    initiated = ...  # type: Any
+    part_number_marker = ...  # type: Any
+    next_part_number_marker = ...  # type: Any
+    max_parts = ...  # type: Any
+    is_truncated = ...  # type: bool
+    def __init__(self, bucket: Optional[Any] = ...) -> None: ...
+    def __iter__(self): ...
+    def to_xml(self): ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def get_all_parts(self, max_parts: Optional[Any] = ..., part_number_marker: Optional[Any] = ..., encoding_type: Optional[Any] = ...): ...
+    def upload_part_from_file(self, fp, part_num, headers: Optional[Any] = ..., replace: bool = ..., cb: Optional[Any] = ..., num_cb: int = ..., md5: Optional[Any] = ..., size: Optional[Any] = ...): ...
+    def copy_part_from_key(self, src_bucket_name, src_key_name, part_num, start: Optional[Any] = ..., end: Optional[Any] = ..., src_version_id: Optional[Any] = ..., headers: Optional[Any] = ...): ...
+    def complete_upload(self): ...
+    def cancel_upload(self): ...
diff --git a/third_party/2and3/boto/s3/prefix.pyi b/third_party/2and3/boto/s3/prefix.pyi
new file mode 100644
index 000000000000..12501b2f46ff
--- /dev/null
+++ b/third_party/2and3/boto/s3/prefix.pyi
@@ -0,0 +1,14 @@
+# Stubs for boto.s3.prefix (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class Prefix:
+    bucket = ...  # type: Any
+    name = ...  # type: Any
+    def __init__(self, bucket: Optional[Any] = ..., name: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    @property
+    def provider(self): ...
diff --git a/third_party/2and3/boto/s3/tagging.pyi b/third_party/2and3/boto/s3/tagging.pyi
new file mode 100644
index 000000000000..07c1fca46a73
--- /dev/null
+++ b/third_party/2and3/boto/s3/tagging.pyi
@@ -0,0 +1,26 @@
+# Stubs for boto.s3.tagging (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class Tag:
+    key = ...  # type: Any
+    value = ...  # type: Any
+    def __init__(self, key: Optional[Any] = ..., value: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+    def __eq__(self, other): ...
+
+class TagSet(list):
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def add_tag(self, key, value): ...
+    def to_xml(self): ...
+
+class Tags(list):
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+    def add_tag_set(self, tag_set): ...
diff --git a/third_party/2and3/boto/s3/user.pyi b/third_party/2and3/boto/s3/user.pyi
new file mode 100644
index 000000000000..21832e9b1302
--- /dev/null
+++ b/third_party/2and3/boto/s3/user.pyi
@@ -0,0 +1,14 @@
+# Stubs for boto.s3.user (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+class User:
+    type = ...  # type: Any
+    id = ...  # type: Any
+    display_name = ...  # type: Any
+    def __init__(self, parent: Optional[Any] = ..., id: str = ..., display_name: str = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self, element_name: str = ...): ...
diff --git a/third_party/2and3/boto/s3/website.pyi b/third_party/2and3/boto/s3/website.pyi
new file mode 100644
index 000000000000..f83207727ad2
--- /dev/null
+++ b/third_party/2and3/boto/s3/website.pyi
@@ -0,0 +1,66 @@
+# Stubs for boto.s3.website (Python 3.5)
+#
+# NOTE: This dynamically typed stub was automatically generated by stubgen.
+
+from typing import Any, Optional
+
+def tag(key, value): ...
+
+class WebsiteConfiguration:
+    suffix = ...  # type: Any
+    error_key = ...  # type: Any
+    redirect_all_requests_to = ...  # type: Any
+    routing_rules = ...  # type: Any
+    def __init__(self, suffix: Optional[Any] = ..., error_key: Optional[Any] = ..., redirect_all_requests_to: Optional[Any] = ..., routing_rules: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+
+class _XMLKeyValue:
+    translator = ...  # type: Any
+    container = ...  # type: Any
+    def __init__(self, translator, container: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+
+class RedirectLocation(_XMLKeyValue):
+    TRANSLATOR = ...  # type: Any
+    hostname = ...  # type: Any
+    protocol = ...  # type: Any
+    def __init__(self, hostname: Optional[Any] = ..., protocol: Optional[Any] = ...) -> None: ...
+    def to_xml(self): ...
+
+class RoutingRules(list):
+    def add_rule(self, rule): ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+
+class RoutingRule:
+    condition = ...  # type: Any
+    redirect = ...  # type: Any
+    def __init__(self, condition: Optional[Any] = ..., redirect: Optional[Any] = ...) -> None: ...
+    def startElement(self, name, attrs, connection): ...
+    def endElement(self, name, value, connection): ...
+    def to_xml(self): ...
+    @classmethod
+    def when(cls, key_prefix: Optional[Any] = ..., http_error_code: Optional[Any] = ...): ...
+    def then_redirect(self, hostname: Optional[Any] = ..., protocol: Optional[Any] = ..., replace_key: Optional[Any] = ..., replace_key_prefix: Optional[Any] = ..., http_redirect_code: Optional[Any] = ...): ...
+
+class Condition(_XMLKeyValue):
+    TRANSLATOR = ...  # type: Any
+    key_prefix = ...  # type: Any
+    http_error_code = ...  # type: Any
+    def __init__(self, key_prefix: Optional[Any] = ..., http_error_code: Optional[Any] = ...) -> None: ...
+    def to_xml(self): ...
+
+class Redirect(_XMLKeyValue):
+    TRANSLATOR = ...  # type: Any
+    hostname = ...  # type: Any
+    protocol = ...  # type: Any
+    replace_key = ...  # type: Any
+    replace_key_prefix = ...  # type: Any
+    http_redirect_code = ...  # type: Any
+    def __init__(self, hostname: Optional[Any] = ..., protocol: Optional[Any] = ..., replace_key: Optional[Any] = ..., replace_key_prefix: Optional[Any] = ..., http_redirect_code: Optional[Any] = ...) -> None: ...
+    def to_xml(self): ...