Revision 1e681db4ff5f4aab566e8dc987586d685fb70f9e

Committed on 26/10/2018 12:55 am by Vidar Langseid <vl@ez.no> [GitHub Diff]

Merge branch '1.7'