FORGE-168, FORGE-169 fixes
Authored by: Rick Copeland 2009-12-28
Parent(s): [65ff51]
Child(ren): [4ea108]