Sync changes from upstream repository
Merge pull request #666 from github/update-1418242505