Sync changes from upstream repository
Merge pull request #527 from github/update-1402268823

Sync changes from upstream repository