Merge pull request #3484 from keertip/tavern

rev up tavern version