Looks like at some point the patch from comment #2 ceased applying cleanly to the master branch, so I have rebased it (please review). I'm fairly confident it's a straightforward rebase so I'm going to go ahead and include it in the pre-OSSA I'm sending now. If it ends up needing adjustment we can do that on the fly since it's just the patch for the development branch anyway.
Looks like at some point the patch from comment #2 ceased applying cleanly to the master branch, so I have rebased it (please review). I'm fairly confident it's a straightforward rebase so I'm going to go ahead and include it in the pre-OSSA I'm sending now. If it ends up needing adjustment we can do that on the fly since it's just the patch for the development branch anyway.