[ark/f20] (5 commits) ...Merge branch 'master' into f21

[Rex Dieter]

Summary of changes:

  dcbc8b2... backport crash fix for nested archives (kde#341187) (*)
  a313634... 14.11.97 (*)
  d96e565... 14.12.1 (*)
  74d5b13... Revert "pull in fix for crash-on-close regression (kde#3411 (*)
  5b420c2... Merge branch 'master' into f21 (*)

(*) This commit already existed in another branch; no separate mail sent