Sync changes from upstream repository
Merge pull request #498 from github/update-1399381096

Sync changes from upstream repository