Sync changes from upstream repository
Merge pull request #521 from github/update-1402098885