Summary of changes: ef87d82... Fix typo in error message in fix for 880972. No functional (*) 0aaddc8... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent