Sync changes from upstream repository
Merge pull request #478 from github/update-1397061603

Sync changes from upstream repository