Revision a646e488992899438a78a1769b6eea0854e80ac0

Committed on 25/01/2019 4:16 am by Maciej Kobus <maciej.kobus@ez.no> [GitHub Diff]

Merge remote-tracking branch 'origin/2.4' into master