Merge proposals

fpga-icestorm in Ubuntu has no merge proposals.