Sync changes from upstream repository
Merge pull request #533 from github/update-1402371792