Sync changes from upstream repository
Merge pull request #649 from github/update-1417427139