am 5a2a2639: Merge "Fix some more pedantic compiler warnings."

* commit '5a2a2639dc2d485b37037a57752d4f411c88ee48':
  Fix some more pedantic compiler warnings.