Revision e9b7215526947070b8da91d37b462392570e1e64

Committed on 05/12/2018 5:49 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '6.13' into 7.2