A conflicting pull request.
Merge pull request #765 from ktf/trivial-change

A conflicting pull request.