merge trunk to merge

plz merge