Here is a copy of the patch (to be applied against 2.2.15) in case you would like to apply it sooner.

Simon