merged in latest trunk