Sync changes from upstream repository
Merge pull request #623 from github/update-1413913772