Sync changes from upstream repository
Merge pull request #580 from github/update-1408142901