Copying trunk to JAFFA_5_15_RELEASE for branch.
Authored by: kevinmiro 2012-11-26
Parent: [r6475]
Child: [r6477]