Sync changes from upstream repository
Merge pull request #573 from github/update-1407283078