Sync changes from upstream repository
Merge pull request #473 from github/update-1396645501

Sync changes from upstream repository