Automatic merge from submit-queue Better waiting for watch event delivery in cacher @lavalamp - I think we should do something simple for now (and merge for 1.5), and do something a bit more sophisticated right after 1.5, WDYT?