Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Author: gribozavr

Diff for: .pep8

@@ -1,3 +1,3 @@
 [flake8]
-filename = *.py,build-script,gyb,line-directive,ns-html2rst,pre-commit-benchmark,recursive-lipo,submit-benchmark-results,update-checkout,viewcfg
-ignore = E101,E111,E128,E265,E302,E501,W191
+filename = *.py,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,gyb,line-directive,ns-html2rst,recursive-lipo,submit-benchmark-results,update-checkout,viewcfg
+ignore = E101,E111,E128,E265,E302,E402,E501,W191

Diff for: CHANGELOG.md

@@ -5,6 +5,12 @@ Swift 3
 * Curried function syntax has been removed, and now produces a compile-time
   error.
 
+* Generic signatures can now contain superclass requirements with generic
+  parameter types, for example:
+
+  ```
+  func f<Food : Chunks<Meat>, Meat : Molerat>(f: Food, m: Meat) {}
+  ```
 
 Swift 2.2
 ---------