Moved from Raven.Contrib