[#2359] Update master before merge.