Merge upstream (0.11)