Sync changes from upstream repository
Merge pull request #648 from github/update-1417426904