[rtorrent/f14] (2 commits) ...Merge branch 'master' into f14

[konradm]

Summary of changes:

  0eee841... bump to latest upstream (*)
  d7cfc63... Merge branch 'master' into f14

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