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

* commit '2a27a640d0d9747659cc609b4384ffead090866e':
  warnings be gone (3/4)