Revision e0399676a1f90aadb3a3ccb6d096db13e81e9e3f

Committed on 05/05/2021 5:15 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge branch '1.2'