Merge remote-tracking branch 'upstream/master'
authorCharlie Hess <charlie@slack-corp.com>
Wed, 1 Jun 2016 21:38:49 +0000 (14:38 -0700)
committerCharlie Hess <charlie@slack-corp.com>
Wed, 1 Jun 2016 21:38:49 +0000 (14:38 -0700)

Trivial merge