am 59985229: Merge "Work-around GCC polymorphism problems."
am 59985229: Merge "Work-around GCC polymorphism problems."

* commit '599852291960c925193ba67fdbf0f6ec4f093787':
  Work-around GCC polymorphism problems.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst