Summary of changes: 442919f... Fix for last fix (bug #1153660, bug #1154284). (*) 6865fda... Merge branch 'f21' (*) This commit already existed in another branch; no separate mail sent