Fix the problem that cannot build
Merging from trunk to branches/yummin