Merge in 'rabbit-retry' from master