Revision e14c3cc9013f3fea43e1e76940b3d5bb444617c7

Committed on 22/05/2020 5:56 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '2017.12' into 2019.03