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

* commit '8819b515f541daea4288a87cfbae37561cb80b13':
  warnings be gone (3/4)