Revision cd2b500176f9a34289936dffced1299bcf868aef

Committed on 28/06/2019 1:16 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '2.4' into 2.5