Updating branch to latest trunk
Authored by: pheonixstorm 2012-07-11
Parent: [r13386]
Child: [r13388]