Merge branch 'master' into next
Conflicts: Changelog.draft.rst
This commit is contained in:
		| @@ -24,6 +24,7 @@ Bug Fixes | ||||
| --------- | ||||
|  | ||||
| * Allow SSL connections to send keep-alive messages. | ||||
| * Fix regression (UIBase is no more). | ||||
|  | ||||
|  | ||||
| Pending for the next major release | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Nicolas Sebrecht
					Nicolas Sebrecht