Sync changes from upstream repository
Merge pull request #645 from github/update-1416907936