Merge from clevertech/YiiBooster