Revision 6da286718eface57c11441bb5ca3eb42ce62c837

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

Merge branch '1.13' into 2.2