am 91ea05d6: am 932614ee: Minor code clean-up for GCC 4.9.

* commit '91ea05d6b6820e6b283cb3431e09d8e53cccb2e7':
  Minor code clean-up for GCC 4.9.