Merge branch 'master' into feature/gii-command
Merge commit '10dc407a3c3f583e267ceb2460f11cbe8b40d988' into feature/gii-command
removed 'gii-console' hack
Merge branch 'feature/gii-command' of https://github.com/schmunk42/yii2 into feature/gii-command
Merge commit '7df59614de6178ed16450eca68913e3b94516ded' into develop