[minor] merge upstream
[minor] fix readme