Revision 899f15e2586d1680b3fbd3e3604d158bf3b914d1

Committed on 20/12/2018 8:31 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '6.13' into 7.2