Sync changes from upstream repository
Merge pull request #627 from github/update-1414194586