Merge proposals

tinyows in Ubuntu has no merge proposals.