Merge branch 'master' of slackhq/SlackTextViewController