cron 2454a8f496 Merge dragonfire changes
Replicate the following commit (with cherry-picked parents on left
side):

    commit 106fab976209f15ee2120b169f9757fd458935cd
    Merge: 7652a30c7 0a2c90f4c
    Author:     cron <example@example.local>
    AuthorDate: Mon Oct 5 22:43:01 2020 +0000
    Commit:     cron <example@example.local>
    CommitDate: Mon Oct 5 22:43:01 2020 +0000

	Merge dragonfire changes
2021-08-28 22:30:52 -05:00
..
2019-11-03 11:45:33 +01:00
2021-08-28 22:30:52 -05:00