Sync changes from upstream repository
Merge pull request #597 from github/update-1410390447