Restored since other projects depend upon these classes.
Authored by: keess 2015-03-28
Parent: [r2704]
Child: [r2706]
