did you have some local patches related to
this patch, that you did not send here?
Because I can not apply the patch on current
master and the changes in the context of
your patch seem like you did something with
default config file path?
Slightly modified version that applies on
current master is attached (the changes
are the same, but the context differs).