[PATCH 3.4] Backport fix for PR 23309

[Nick Clifton]

Hi Gabriel,

> | The following patch is a backport to the 3.4-branch for PR 23309.
> | Please commit into 3.4-branch?
> 
> Nick, did you take care of this?

Yes.  Sorry about the delay in doing so - I was caught out by the 
CVS->Subversion switch.

Cheers
   Nick