Merge proposals

libofa in Ubuntu has no merge proposals.