Master Yii fork (to be kept synchronised with the original