Revision 68d84e91fa8ef353e944c3357298e7b7f6fdfb86

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

Merge branch '2.3'