Merge pull request #1 from slackhq/master