Revision 3a244cf75257ed9d1bfeaeedbd46b29beb7e087f

Committed on 12/08/2019 6:01 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.5'