Sync changes from upstream repository
Merge pull request #554 from github/update-1404927234