Merge remote-tracking branch 'jerlbeck/features/rtp-header-patching'