am 39c2a379: Merge "Fix fugu build" into lmp-dev

* commit '39c2a379795460374b41e627257130e3c4ab961f':
  Fix fugu build