461262a
4.18-2 - backport upstream fix for proper out-of-src-tree builds - backport upstream fix for Diamond inheritance (#1345953)