Merge branch '1.11' into 1.12

.travis.yml

@@ -9,5 +9,7 @@
 notifications:
   irc:
     channels: "irc.freenode.org#paramiko"
+    template:
+      - "%{repository}@%{branch}: %{message} (%{build_url})"
     on_success: change
     on_failure: change
@@ -12,2 +14,4 @@
     on_success: change
     on_failure: change
+    use_notice: true
+  email: false