am 674c0445: Merge "toolbox: silence some compiler warnings"

* commit '674c0445e25cdf9bcd7d32a84103bd3b7e24a4a0':
  toolbox: silence some compiler warnings