Revision 5ca2994367be302c2e5b596afbba674091b1f664

Committed on 25/07/2019 5:50 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.5'