Sync changes from upstream repository
Merge pull request #657 from github/update-1417636826