Sync changes from upstream repository
Merge pull request #523 from github/update-1402146107