Sync changes from upstream repository
Merge pull request #490 from github/update-1398502462

Sync changes from upstream repository