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

[Jiří Popelka]

Summary of changes:

  6fc5b7a... Avoid KeyError in ui4/wifisetupdialog.py (bug #680939). (*)
  b088af8... Merge branch 'f14' into f15

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