Sync changes from upstream repository
Merge pull request #525 from github/update-1402264404