Revision 5fc7420724e25ee11f2b27e833c02ad714c84cfc

Committed on 05/12/2018 5:47 am by Gunnstein Lye <gunnstein.lye@ez.no> [GitHub Diff]

Merge branch '6.7' into 6.13