Sync changes from upstream repository
Merge pull request #581 from github/update-1408469152