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

diff --cc app/controllers/api/users_controller.rb
Simple merge

diff --cc app/models/trace.rb
Simple merge

diff --cc test/controllers/api/traces_controller_test.rb
Simple merge