Merge proposals dependent on lp://staging/~mmach/netext73/trompeloeil-cpp

lp://staging/~mmach/netext73/trompeloeil-cpp has no merge proposals.