Additions and alterations to remove build error messages
Authored by: steve_yates 2012-03-22
Parent: [r316]
Child: [r318]