Merge "Add a caught_by context field to exceptions"