Hi,

this patch fixes PR 51825.

Built and regtested on Linux 3.2.0-4-686-pae.

(Dear Jerry, this is my patch you wanted to look at, but improved with  
test cases and Changelog. Please consider looking at this version instead  
of the old version. Thank you!)

Regards,

	Tilo