Merge proposals

tachyon in Ubuntu has no merge proposals.