tets yii 1.0
Merge branch 'master' into yii1.1