[hplip/f16] (3 commits) ...Merge branch 'f15' into f16

[Tim Waugh]

Summary of changes:

  9119755... Corrected IEEE 1284 Device IDs. (*)
  96cd1a1... Merge branch 'f14' into f15 (*)
  40d5512... Merge branch 'f15' into f16

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