Upgrade to airlift 0.87-SNAPSHOT