Revision a0268249c5b466ade25d2b7cfa6d43d2f08e9908

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

Merge branch '2.2' into 2.3