Branch from v2246 for me.

git-svn-id: http://forge.voodooprojects.org/svn/chameleon@2247 b5af796a-00a8-11df-919b-ffff7a100b7d