Merge proposals

jmock in Ubuntu has no merge proposals.