Revision d4d7f05b35e5ee6742a727cc0907d51b1a6bd5e3

Committed on 25/06/2019 7:08 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '2.4' into 2.5