Merge trunk head (r49270)