Sync changes from upstream repository
Merge pull request #625 from github/update-1414049764