Revision e2d29f008f436c9c53f20acc037014335c60a4d7

Committed on 11/12/2018 9:03 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '7.2' into 7.3