Sync changes from upstream repository
Merge pull request #516 from github/update-1401230656