Merge proposals

aa3d in Ubuntu has no merge proposals.