Revision eceffa2975e0742b7d6890e76702e469cf2177a0

Committed on 18/01/2019 4:16 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '2.3' into 2.4