Sync changes from upstream repository
Merge pull request #501 from github/update-1399655021

Sync changes from upstream repository