Sync changes from upstream repository
Merge pull request #537 from github/update-1403025384