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

author Tom Hughes <tom@compton.nu>

Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)

committer Tom Hughes <tom@compton.nu>

Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
author Tom Hughes <tom@compton.nu>
Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
committer Tom Hughes <tom@compton.nu>
Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
committer	Tom Hughes <tom@compton.nu>
	Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history