Sync changes from upstream repository
Merge pull request #653 from github/update-1417558358