Only give necessary context
Merge pull request #2473 from riking/patch-1

Only give necessary context