[kppp] (5 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  f4ade64... 4.11.4 (*)
  b773b69... 4.11.5 (*)
  1a092e0... Revert "4.11.5" (*)
  7d7a43a... Revert "4.11.4" (*)
  772d1a5... Merge branch 'master' into f20 (*)

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