Merge trunk (r43561)