Revision 787a455147e7f7b92b00c70182a62bda26b80291

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

Merge branch '6.7' into 6.13