Summary of changes: 3dc8d72... Merge branch 'master' into f17 (*) daa56d7... 0.8.1 (*) 8be9a80... 0.8.1 (*) 483b1fe... fix merge conflict e532a5f... 0.8.2 (*) This commit already existed in another branch; no separate mail sent