upstream/1.1_rc2
56b7d893 · config/output: fix typo in merge_id_on_name ·