Merge remote branch 'origin/master'

* origin/master:
  Revert "When inserting Cat::Req::REST, always add trait, rather than sometimes using the Cat::Req::REST class directly."

diff --cc lib/Catalyst/Request/REST.pm
Simple merge