Sync changes from upstream repository
Merge pull request #494 from github/update-1398762275

Sync changes from upstream repository