Merge bruno-penguin-1 into vudu_moca2
tree: b5cd9b242c2c920fad8812d2e3e1728ef4765af4
  1. libupgrade/
  2. makehdf