Sync changes from upstream repository
Merge pull request #622 from github/update-1413838478