Merge branch 'master' into feat/generic-1

Author: fredbi

CONTRIBUTORS.md

@@ -4,15 +4,15 @@
 
 | Total Contributors | Total Contributions |
 | --- | --- |
-| 256  | 1117  |
+| 256  | 1124  |
 
 | Username | All Time Contribution Count | All Commits |
 | --- | --- | --- |
 | @ernesto-jimenez | 129 | https://github.com/go-openapi/testify/commits?author=ernesto-jimenez |
 | @brackendawson | 110 | https://github.com/go-openapi/testify/commits?author=brackendawson |
 | @dolmen | 103 | https://github.com/go-openapi/testify/commits?author=dolmen |
+| @fredbi | 66 | https://github.com/go-openapi/testify/commits?author=fredbi |
 | @tylerb | 64 | https://github.com/go-openapi/testify/commits?author=tylerb |
-| @fredbi | 59 | https://github.com/go-openapi/testify/commits?author=fredbi |
 | @boyan-soubachov | 35 | https://github.com/go-openapi/testify/commits?author=boyan-soubachov |
 | @leighmcculloch | 26 | https://github.com/go-openapi/testify/commits?author=leighmcculloch |
 | @pmezard | 19 | https://github.com/go-openapi/testify/commits?author=pmezard |