Revision 84bafbdee43ae1fe4b10b25ccf167f06e22265b7

Committed on 25/03/2020 6:45 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge branch '2.0'