Merged current trunk to branch.