Updated patch to work against latest trunk, however it is still in need of the mentioned refinements.
Updated patch to work against latest trunk, however it is still in need of the mentioned refinements.