Improved  to support aliases. Fixes #2240.
Merge branch 'master' of git://github.com/yiisoft/yii2 into 2240-am-aliases
Merge pull request #2243 from vova07/2240-am-aliases

2240 am aliases