Merge trunk head (r45466)