Sync changes from upstream repository
Merge pull request #587 from github/update-1409162348