Sync changes from upstream repository
Merge pull request #633 from github/update-1415151380