Revision 093541109645f6b46efaf562466943924f85240a

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

Merge branch '1.7' into 1.13