Merge "Pacify g++ about a set-but-unused variable."
am: 73139dd

* commit '73139dd7c12906975e835ae6e6707266626fed2a':
  Pacify g++ about a set-but-unused variable.