Merge proposals

firmware-updater has no merge proposals.