looks like this patch duplicates some changes from pull requst 22 (custom headers in dispatch). But I guess you'll see the merge errors once you try it for real.