Revision b0cbf55eeca6f4bbb3850960c79e385d3a2f2e17

Committed on 04/11/2020 4:00 am by Gunnstein Lye <gunnstein.lye@ibexa.co> [GitHub Diff]

Merge remote-tracking branch 'origin/1.13' into 2.5