Merge upstream again

@kvs @phoet merging upstream again