Sync changes from upstream repository
Merge pull request #588 from github/update-1409264960