Sync changes from upstream repository
Merge pull request #550 from github/update-1404758548