Backport from trunk: close bug#5857.