Merge trunk head (r43756)