UPD: merge with YiiBooster/master