Merge upstream changes into readme branch