Merging from trunk to branches/yummin