Summary of changes: c39c2d5... Added upstream patch to avoid build failure (*) 641aaef... Merge remote branch 'origin/master' into f18 (*) This commit already existed in another branch; no separate mail sent