Merge pull request #354 from ageery/master

Enhancement to annotation event dispatcher: unwrap and rethrow ReplaceHandlerExceptions