Sync changes from upstream repository
Merge pull request #477 from github/update-1396984071

Sync changes from upstream repository