Update trunk to 3.15-snapshot