Revision ea4eeb418e69ef3109bf603090ceb5a6440b06d6

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

Merge branch '2.4'