Attaching updated minimal diff if patch from comment 5 against 0.91+devel r14757 - @Tav, please review and commit if ok.
Attaching updated minimal diff if patch from comment 5 against 0.91+devel r14757 - @Tav, please review and commit if ok.