Sync changes from upstream repository
Merge pull request #481 from github/update-1397375838

Sync changes from upstream repository