Revision 8f3c93f9baaff6271068b918fbdfcd58416435fe

Committed on 13/08/2018 10:21 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.7' into 1.13