Revision c77964e2c31a27a67213db8268964ad8737eb525

Committed on 17/10/2018 7:59 am by Andrew Longosz <andrzej.longosz@ez.no> [GitHub Diff]

Merge branch '6.7' into 6.13