Merge remote-tracking branch 'upstream/pull/2120'

author Tom Hughes <tom@compton.nu>

Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)

committer Tom Hughes <tom@compton.nu>

Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
author Tom Hughes <tom@compton.nu>
Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
committer Tom Hughes <tom@compton.nu>
Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
author	Tom Hughes <tom@compton.nu>
	Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
committer	Tom Hughes <tom@compton.nu>
	Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history