Merging with Trunk, no changes introduced to the State Diagram.
Authored by: agalal 2012-08-20
Parent: [r975]
Child: [r977]