Storm

Merge proposals dependent on lp://staging/~cjwatson/storm/fix-wrapped-exception-caching

  1. fix-wrapped-exception-caching
  2. Dependent merge proposals

lp://staging/~cjwatson/storm/fix-wrapped-exception-caching has no merge proposals.