Sync changes from upstream repository
Merge pull request #500 from github/update-1399588824

Sync changes from upstream repository