Summary of changes: 82200be... fix bz#810500, fix crash in assistant (*) c3c8eaa... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent