Revision db39e626298baa343238c860946503664b3063d2

Committed on 18/01/2019 9:13 am by Marek Nocon <marek.nocon@ez.no> [GitHub Diff]

Merge branch '2.4'