Merge remote branch 'origin/topic/prepare_action_in_try'

* origin/topic/prepare_action_in_try:
  Explain the logic here, as it's crazy. But I think this works.
  Move prepare_action call into try block

diff --cc lib/Catalyst.pm
Simple merge