Sync changes from upstream repository
Merge pull request #591 from github/update-1409344822