am 79724856: Merge "warnings be gone (2/4)"

* commit '797248568b5ba32606ac0d8de024190e3cc95973':
  warnings be gone (2/4)