Sync changes from upstream repository
Merge pull request #654 from github/update-1417606170