Simplified bugfix: no more checking for different class types, just use the toString() method.
Authored by: jwjoubert 2014-06-29
Parent: [r29487]
Child: [r29489]