'update_0_9_branch'. git-svn-id: svn://10.0.0.236/branches/update_0_9_branch@163308 18797224-902f-48f8-a5cc-f745e15eee43