Backport rev 55465 by Nick Coghlan.
1 file changed