JAFFA - 254 - Merge all code changes from the SWAT branch into the JAFFA trunk.
Authored by: ndzwill 2015-03-03
Parent: [r8080]
Child: [r8082]