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

author Tom Hughes <tom@compton.nu>

Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)

committer Tom Hughes <tom@compton.nu>

Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)
author Tom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)
committer Tom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)
diff --cc test/controllers/users_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)
committer	Tom Hughes <tom@compton.nu>
	Wed, 15 Jan 2020 10:11:30 +0000 (10:11 +0000)