Sync changes from upstream repository
Merge pull request #569 from github/update-1406838563