Revision b1748ff65c6f8acba32cf01f79f2f0ec2bb8edc1

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

Merge remote-tracking branch 'origin/2.5'