Sync changes from upstream repository
Merge pull request #600 from github/update-1410722180