Summary of changes: d10ba26... Use upstream patch for STR #4461. (*) 37f28ef... Merge branch 'f20' into f21 (*) This commit already existed in another branch; no separate mail sent