am 4cd0d582: am 0938c6f7: Merge "warnings be gone (4/4)"

* commit '4cd0d582379ca9decba7ee0b99010d9a39f298de':
  warnings be gone (4/4)