For some reason, this commit didn't make it through when merging
from openchange/openchange master last time.