Backport from trunk: close bug#6190.