Summary of changes: 1ccc93f... Use better upstream fix for STR #3608 (bug #606909). (*) 7fe5158... Merge branch 'f12' into f13 (*) This commit already existed in another branch; no separate mail sent