Sync changes from upstream repository
Merge pull request #589 from github/update-1409338221