Revision f21ecfa3f960b3a26ce2299a7e6359c188fa1d14

Committed on 01/04/2020 3:28 am by Maciej Kobus <maciej.kobus@ez.no> [GitHub Diff]

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