Merge branch 'master' into patch-1

author Jimmy Yuen Ho Wong <wyuenho@gmail.com>

Wed, 22 Jul 2020 01:05:31 +0000 (02:05 +0100)

committer GitHub <noreply@github.com>

Wed, 22 Jul 2020 01:05:31 +0000 (02:05 +0100)
author Jimmy Yuen Ho Wong <wyuenho@gmail.com>
Wed, 22 Jul 2020 01:05:31 +0000 (02:05 +0100)
committer GitHub <noreply@github.com>
Wed, 22 Jul 2020 01:05:31 +0000 (02:05 +0100)
diff --cc test/lisp/use-package/use-package-tests.el
Simple merge
author	Jimmy Yuen Ho Wong <wyuenho@gmail.com>
	Wed, 22 Jul 2020 01:05:31 +0000 (02:05 +0100)
committer	GitHub <noreply@github.com>
	Wed, 22 Jul 2020 01:05:31 +0000 (02:05 +0100)