Sync changes from upstream repository
Merge pull request #586 from github/update-1409030354