Merge pull request #1 from eventbrite/master

Update from eventbrite