Updated for Yii bug #2680
Merge branch 'master' of github.com:lukos/yii

Conflicts:
	framework/web/CController.php