Merge branch 'master' into switch-to-cryptography

Conflicts:
	.travis.yml
	paramiko/ecdsakey.py
	paramiko/transport.py

1 files changed, 4 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 5f444d93..cb2a7e8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
 install:
   # Self-install for setup.py-driven deps
   - pip install -e .
@@ -12,14 +13,13 @@ install:
   - pip install coveralls # For coveralls.io specifically
   - pip install -r dev-requirements.txt
 script:
-  # Main tests, with coverage!
-  - inv test --coverage
+  # Main tests, w/ coverage!
+  - "inv test --coverage"
   # Ensure documentation & invoke pipeline run OK.
   # Run 'docs' first since its objects.inv is referred to by 'www'.
   # Also force warnings to be errors since most of them tend to be actual
   # problems.
-  - "invoke docs -o -W || true"
-  - "invoke www -o -W || true"
+  - invoke docs -o -W www -o -W
 notifications:
   irc:
     channels: "irc.freenode.org#paramiko"