Sync changes from upstream repository
Merge pull request #626 from github/update-1414129092