Merging Yelp:master into ours

This should bring our master up to date with the official Yelp one.