Revision b14c68f23cfbe628e9f59a476e68d40439bb8c48

Committed on 07/02/2019 5:12 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.3' into 2.4