29799537a7
Backport of #5872 to v1.7 Signed-off-by: Andrew Thornton <art27@cantab.net>
Backport of #5872 to v1.7 Signed-off-by: Andrew Thornton <art27@cantab.net>