Sync changes from upstream repository
Merge pull request #531 from github/update-1402352797