Merge branch 'hotfix/1.2.10'
Upgrade to use yii-extension 1.1.1
Merge branch 'hotfix/1.2.11' into develop