Merge branch 'master' into json

author Harmon <Harmon758@gmail.com>

Fri, 26 Apr 2019 04:41:04 +0000 (23:41 -0500)

committer GitHub <noreply@github.com>

Fri, 26 Apr 2019 04:41:04 +0000 (23:41 -0500)
author Harmon <Harmon758@gmail.com>
Fri, 26 Apr 2019 04:41:04 +0000 (23:41 -0500)
committer GitHub <noreply@github.com>
Fri, 26 Apr 2019 04:41:04 +0000 (23:41 -0500)
diff --cc tweepy/streaming.py
Simple merge
diff --cc tweepy/utils.py
Simple merge
author	Harmon <Harmon758@gmail.com>
	Fri, 26 Apr 2019 04:41:04 +0000 (23:41 -0500)
committer	GitHub <noreply@github.com>
	Fri, 26 Apr 2019 04:41:04 +0000 (23:41 -0500)
		1	2
tweepy/streaming.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history