Revision db2b255757e1161093b4dbab8f52c1d2c41a65a5

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

Merge remote-tracking branch 'upstream/2.5'