Revision 6818322da7439b27d880b6f67f98af6c1288c6d7

Committed on 26/06/2019 6:24 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.5'