Sync changes from upstream repository
Merge pull request #601 from github/update-1410897743