MFH: r372407

Add patch from upstream to unbreak on i386 with clang