Merge against trunk (2345)

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