Revision 14bebef6687a07b39f5c5bb55726b08cf1ad4be1

Committed on 18/01/2019 4:15 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '1.11' into 2.3