Summary of changes: c7bc209... upstream patch to fix text handling (*) 8f29ba5... Merge branch 'f18' into f17 (*) This commit already existed in another branch; no separate mail sent