Sync changes from upstream repository
Merge pull request #602 from github/update-1411067264