Summary of changes: 207e1d8... Cherry pick 2 patches from upstream fixing cheese crashing (*) 03c6103... Merge remote-tracking branch 'origin/master' into f17 (*) This commit already existed in another branch; no separate mail sent