Corrected for changes in other classes...
Authored by: boescpa 2014-10-22
Parent: [r30710]
Child: [r30712]