Merge proposals

galois in Ubuntu has no merge proposals.