Revision 592f726794f70a06d9788641577d5d2dc5e12ee8

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

Merge branch '2.4'