Sync changes from upstream repository
Merge pull request #489 from github/update-1398457325