Merge proposals

libhitaki in Ubuntu has no merge proposals.