Revision 06b7c69cb9efa6f066d79a6172b9060c5866ba9b

Committed on 10/06/2022 7:14 am by Edi Modric <edi.modric@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'origin/1.3' into 2.1