Copying trunk to JAFFA_5_16_RELEASE for branch.
Authored by: kevinmiro 2013-04-08
Parent: [r7099]
Child: [r7101]