am 170168cd: Merge "Temporarily address gcc 4.7 breakage."

* commit '170168cdf37111b45b15817fab9e3df54cbc27b7':
  Temporarily address gcc 4.7 breakage.