Updating branch to latest trunk. Try #2 - computer crash during first attempt
Authored by: pheonixstorm 2011-12-30
Parent: [r13279]
Child: [r13281]