Merging with trunk, no changes are made to Activity diagram code.
Authored by: agalal 2012-08-20
Parent: [r979]
Child: [r981]