Merge from streamy-couch.