Updating 1.5 branch head
Update trunk