Cherry picked airbrake gem stuff