Sync changes from upstream repository
Merge pull request #596 from github/update-1410380573