[jasper/f21] (3 commits) ...Merge branch 'f20' into f21

[Jiří Popelka]

Summary of changes:

  206ab97... CVE-2014-8137, CVE-2014-8138 (#1175761) (*)
  76d5098... Merge branch 'f19' into f20 (*)
  a275b0f... Merge branch 'f20' into f21

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