Sync changes from upstream repository
Merge pull request #607 from github/update-1411583417