Revision 317998d03d0b13ffebc5c3b2d6eb8f2be82b31ea

Committed on 17/04/2019 9:41 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '2.4'