Fix Savannah bug #27017 (patch against 4.5.x)

[James Youngman]

This patch is similar to the other patch for the same bug, but this
one is against the 4.5.x tree.