am 77338a29: Merge "Address additional warnings found by GCC 4.9."

* commit '77338a2969c4b5d6de5200c326ef67d6a82e95b2':
  Address additional warnings found by GCC 4.9.