Summary of changes: 3cfb7af... Merge branch 'master' into f17 (*) cbbdae5... 3.2.2 (*) 65bc254... just mark as merged (*) This commit already existed in another branch; no separate mail sent