Sync changes from upstream repository
Merge pull request #546 from github/update-1404230795