Gittrac #5513:  Incorporated Ben's patch.
Gittrac #5513:  Incorporated Ben's patch.

htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor,htcondor/htcondor