Revision 40702cfb020a54d333bce6e6f47c707809ccbab9

Committed on 24/09/2018 8:13 am by Andrew Longosz <andrzej.longosz@ez.no> [GitHub Diff]

Merge branch '6.7' into 6.13