Should be final update of branch code and project files
Authored by: pheonixstorm 2012-07-25
Parent: [r13396]
Child: [r13398]