Merge "Bug 1372 - toString methods in generated classes"