Revision 716b53343f698d74f32f393bbdc36f723758cb0e

Committed on 28/01/2019 7:11 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.4'