Sync changes from upstream repository
Merge pull request #479 from github/update-1397157833

Sync changes from upstream repository