Revision 332357ec8fa40f58630eea663a46978d2852a7f7

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

Merge branch '2.3' into 2.4